overte-AleziaKurdis/interface
David Rowe 1f3045ad30 Merge branch 'master' into 21089
Conflicts:
	interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
..
external
i18n
icon
resources Merge branch 'master' into 21089 2016-12-13 14:05:24 +13:00
src Merge branch 'master' into 21089 2016-12-13 14:05:24 +13:00
ui
CMakeLists.txt Potentially fix OSX and Linux build errors? 2016-11-18 14:39:30 -08:00
interface.exe.manifest