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

Browse Source

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

...

This commit is contained in:

Siana Gearz

2012-03-28 22:27:45 +02:00

parent be9f3178c0 3d6511f4e1

commit f05edda4f4

264 changed files with 27606 additions and 15368 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

864

indra/newview/llviewermenu.cpp

File diff suppressed because it is too large Load Diff