Bradley Austin Davis a7eebfd002 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer		2015-03-31 15:42:01 -07:00
..
external	Merge branch 'master' into oculus_old_renderer	2015-03-30 16:36:00 -07:00
icon
resources	editEntities.js --> edit.js	2015-03-27 14:40:16 -07:00
src	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-31 15:42:01 -07:00
ui	Switching to .com	2015-03-25 12:36:37 -06:00
CMakeLists.txt
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in