overte/interface
Ryan Huffman 21819ce3b4 Merge branch '19630' of github.com:huffman/hifi into 19630
Conflicts:
	interface/src/Menu.h
2014-05-15 14:37:05 -07:00
..
external Better instructions. 2014-05-12 17:55:07 -07:00
resources fixed mention sounds dir for deployment 2014-05-12 20:55:24 +02:00
src Merge branch '19630' of github.com:huffman/hifi into 19630 2014-05-15 14:37:05 -07:00
ui Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-12 19:42:44 +02:00
CMakeLists.txt Merge pull request #2856 from ZappoMan/modelserver 2014-05-14 15:03:49 -07:00
interface.icns
interface_en.ts Merge branch master 2014-04-24 18:52:59 +05:30
InterfaceConfig.h.in missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
InterfaceVersion.h.in missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00