Andrew Meadows 922912b784 merge upstream/master into andrew/ragdoll ... Conflicts: interface/src/Menu.h		2014-07-16 09:00:36 -07:00
..
external	updates to RtMidi find module to look for static or dynamic lib	2014-07-08 12:06:43 -07:00
resources	Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays.	2014-07-09 13:27:42 -07:00
src	merge upstream/master into andrew/ragdoll	2014-07-16 09:00:36 -07:00
ui	Merge pull request #3108 from huffman/19800	2014-07-02 15:46:56 -07:00
CMakeLists.txt	updates to RtMidi find module to look for static or dynamic lib	2014-07-08 12:06:43 -07:00
interface.icns	update the interface icon	2014-07-07 11:46:57 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in