Olivier Goffart 2de288c5f3 Merge remote-tracking branch 'origin/1.5' ... Conflicts: VERSION.cmake		2014-02-19 10:21:23 +01:00
..
osx	OS X: Document how to disable the auto updater	2014-02-13 14:11:04 +01:00
win	[tx-robot] updated from transifex	2014-02-18 06:14:46 -05:00