Siana Gearz d385de9139 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer ...

Conflicts:
	indra/newview/llstartup.cpp
	indra/newview/llviewerregion.cpp

2012-01-24 21:22:49 +01:00

..

en-us

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

2012-01-24 21:22:49 +01:00

fr

Tweak to CannotCopyWarning notification. Updated french notifications.xml a tiny bit.

2012-01-18 17:51:09 -06:00