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

Conflicts:
	indra/newview/llvoavatar.cpp

2012-02-01 03:10:46 -06:00

..

en-us

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

2012-02-01 03:10:46 -06:00

fr

A few more translated tidbits. Also converted french strings.xml from BOM with windows lineendings, to non-BOM with unix lineendings.

2012-01-28 22:07:13 -06:00