Stephen Birarda a059e44011 resolve conflicts on merge with upstream master		2013-05-10 14:01:52 -07:00
..
external	add linking of LibOVR to interface CMakeLists.txt	2013-05-09 15:03:14 -07:00
resources	Log cleanup. removed star field meridians.	2013-05-09 22:06:32 -07:00
src	Merge remote-tracking branch 'upstream/master' into oculus	2013-05-10 14:00:10 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream master	2013-05-10 14:01:52 -07:00
Interface.icns	include the icon file referenced in last commit	2013-02-15 13:01:00 -08:00
InterfaceConfig.h.in	add header for glut to conditional include in InterfaceConfig	2013-02-08 14:57:59 -08:00