Files
SingularityViewer/indra/newview/app_settings
Siana Gearz fd22d80dfd Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp
2011-12-24 20:12:12 +01:00
..
2011-12-02 10:41:53 -05:00
2010-04-02 02:48:44 -03:00
2011-03-01 06:21:21 +01:00
2011-04-30 22:00:12 +02:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-11-17 03:51:58 -06:00
2010-04-02 02:48:44 -03:00