Merge remote-tracking branch 'upstream/master' into gtk3
authorTony <exocoder@gmail.com>
Tue, 8 Apr 2014 18:25:51 +0000 (19:25 +0100)
committerTony <exocoder@gmail.com>
Tue, 8 Apr 2014 18:25:51 +0000 (19:25 +0100)
commitd60be58a924bdebf8874a862473c35bfd07922fd
tree56b53fbf62ce172f878cfa9ad88e0301f6dea0a1
parent7daec9e9a803c7a318eda415b6cb7773ea700666
parent5600bc54f4e751180f7c9d50b17235bba2f086af
Merge remote-tracking branch 'upstream/master' into gtk3

Conflicts:
CMakeLists.txt
CMakeLists.txt