Ryan Huffman aaddecd024 Merge remote-tracking branch 'upstream/master' into 19554 ... Conflicts: interface/resources/resources.qrc interface/ui/chatWindow.ui		2014-04-14 11:20:49 -07:00
..
config
html
icons
images	Merge remote-tracking branch 'upstream/master' into 19554	2014-04-14 11:20:49 -07:00
info
meshes
shaders	add apache license to shader headers	2014-04-09 09:59:05 -07:00
sounds
styles	removed dependency on QT resource	2014-04-11 00:54:54 +02:00
visage	Add Ryan's updated smoothing factors.	2014-03-21 10:38:29 -07:00