overte/interface
Brad Davis 7955eeda28 Merge branch 'master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
2015-06-12 15:49:35 -07:00
..
external
icon
resources Merge branch 'master' into plugins 2015-06-12 15:49:35 -07:00
src Merge branch 'master' into plugins 2015-06-12 15:49:35 -07:00
ui Remove scripts 'Tip' label 2015-05-13 09:32:17 -07:00
CMakeLists.txt Merge branch 'master' into plugins 2015-06-10 14:21:48 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in