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

Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp

2012-08-09 02:11:14 +02:00

..

days

…

skies

…

water

…

clouds2.tga

…

postprocesseffects.xml

…