Merge remote-tracking branch 'upstream/master' into gtk3
authorTony <exocoder@gmail.com>
Thu, 10 Apr 2014 19:10:28 +0000 (20:10 +0100)
committerTony <exocoder@gmail.com>
Thu, 10 Apr 2014 19:10:28 +0000 (20:10 +0100)
commit47d4f8cd61ad5f7ef059ae52f1526cffa5f0d63b
treee7e5d5b9ef1033466dac70e186cb174197b41c2b
parent2f9dad5ce894ba0dd0d6faf40e96ac01c6b1c37d
parent7b366df8226fd692b1d5995d4b434c837924fa83
Merge remote-tracking branch 'upstream/master' into gtk3

Conflicts:
CMakeLists.txt
CMakeLists.txt