f1beb8b Update to 1.2.1

Authored and Committed by kalev 11 years ago
    Update to 1.2.1
    
    ... and drop upstreamed libjpeg-turbo-dont-conflict-with-basetsd-h.diff.
    
        
file modified
+1 -0
file modified
+8 -11
file modified
+1 -1