Files
SingularityViewer/indra/newview/skins
Shyotl 93ca5d3482 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into Moap
Conflicts:
	indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
2013-06-27 22:07:31 -05:00
..
2012-08-05 20:40:02 -04:00
2012-08-25 16:23:29 -04:00
2012-08-25 16:23:29 -04:00