Brad Davis 1c49dde6f8 Merge branch 'master' into plugins ... Conflicts: CMakeLists.txt		2015-05-28 14:30:19 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Working on web entities	2015-05-13 00:27:57 -07:00
src	Merge branch 'master' into plugins	2015-05-28 14:30:19 -07:00
ui	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
CMakeLists.txt	Working on stereo rendering	2015-05-22 17:51:59 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in