Changeset - r686:72ac25ad276e
« 543:32fb28
« 685:57e6f5
691:8d289c »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge
0 2 0
merge default
2 files changed with 3 insertions and 3 deletions:
lemon/Makefile.am
2
2
lemon/core.h
1
1
↑ Collapse diff ↑
lemon/Makefile.am
Ignore white space 6 line context
... ... 
@@ -15,7 +15,8 @@
15 15 
	lemon/random.cc \
16 16 
	lemon/bits/windows.cc
17 17 

			




	18
	
	
		

			




	
	18
	
		
nodist_lemon_HEADERS = lemon/config.h	


			




	
	19
	
		
	


			




	19
	20
	
		
lemon_libemon_la_CXXFLAGS = \


			




	20
	21
	
		
	$(AM_CXXFLAGS) \


			




	21
	22
	
		
	$(GLPK_CFLAGS) \


			




	...
	...
	
		
@@ -62,7 +63,6 @@


			




	62
	63
	
		
	lemon/clp.h \


			




	63
	64
	
		
	lemon/color.h \


			




	64
	65
	
		
	lemon/concept_check.h \


			




	65
	
	
		
	lemon/config.h \


			




	66
	66
	
		
	lemon/connectivity.h \


			




	67
	67
	
		
	lemon/counter.h \


			




	68
	68
	
		
	lemon/core.h \

			




        

    

    

    

        

            

                

                    lemon/core.h
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -22,7 +22,7 @@


			




	22
	22
	
		
#include <vector>


			




	23
	23
	
		
#include <algorithm>


			




	24
	24
	
		

			




	25
	
	
		
#include <lemon/core.h>


			




	
	25
	
		
#include <lemon/config.h>


			




	26
	26
	
		
#include <lemon/bits/enable_if.h>


			




	27
	27
	
		
#include <lemon/bits/traits.h>


			




	28
	28
	
		
#include <lemon/assert.h>


			




        

    






    
    



    


    

     
    
0 comments (0 inline)