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

Conflicts:
	indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml - Resolved to the eye's pleasure.

2012-07-20 10:41:25 -04:00

..

en-us

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

2012-07-20 10:41:25 -04:00

es

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

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

fr

menu_inventory.xml translations update.

2012-07-18 16:04:12 -04:00