d32dcee Merge remote-tracking branch 'origin/master' into f15

Merged and Committed by sailer 12 years ago
    Merge remote-tracking branch 'origin/master' into f15
    
    Conflicts:
    	.gitignore
    	mingw32-boost.spec
    	sources
    
        
file modified
+4 -0
boost-1.46.1-signals-erase.patch boost-1.46.0-signals-erase.patch
file renamed
file was renamed with no change to the file
file modified
+11 -16
file modified
+1 -1