Commit Graph

6 Commits

Author SHA1 Message Date
Siana Gearz
f05edda4f4 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml
2012-03-28 22:27:45 +02:00
Siana Gearz
efd1b2bfa9 French translation update and file cleanup 2012-03-05 19:17:07 +01:00
Shyotl
a76105a60d Few things were missing/misnamed in menu_inventory.xml 2012-02-19 17:28:16 -06:00
Siana Gearz
5c2b1d396b French! Huge thanks to Nomade Zhao! 2011-11-02 05:28:02 +01:00
Siana Gearz
6a7c9250fd Branding pt1 2010-11-14 17:28:44 +01:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00