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

..

en-us

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

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

es

Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer

2012-07-18 22:58:52 -04:00

fr

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

2012-08-09 00:42:23 +02:00