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

..

en-us

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2011-12-24 20:12:12 +01:00

fr

#9 - region restart delay

2011-11-10 03:45:29 +01:00