Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 31 Aug 2015 16:29:06 +0000 (17:29 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 31 Aug 2015 16:29:06 +0000 (17:29 +0100)
commitada1c702da6a1d892286a8665d9e0e93dac4c166
tree52036c4ac945b88301501ddbc5a5bcb78a289f16
parent8d62b84e5a367e6e0f9d6541ac5b86411b216050
parent6c334975aaf31f87dd0283f391671df441022751
Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
src/wx/po/fr_FR.po