overte-thingvellir/interface
David Rowe e6473fc8b9 Merge branch 'master' into 20639
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
..
external Merge branch 'master' into 20639 2015-08-05 16:49:06 -07:00
icon
resources Cleanup and PR comments 2015-08-08 13:54:37 -07:00
src Merge branch 'master' into 20639 2015-08-11 12:34:28 -07:00
ui Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
CMakeLists.txt Merge branch 'master' into 20639 2015-08-11 12:34:28 -07:00
interface_en.ts
InterfaceVersion.h.in