Merge branch 'master' into UICleanup

Browse Source

Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp

...

This commit is contained in:

Shyotl

2013-05-03 21:41:51 -05:00

parent 525f3c6a1d 532fc68657

commit e8ce35ebf8

210 changed files with 10451 additions and 6643 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

2372

indra/newview/llviewermenu.cpp

File diff suppressed because it is too large Load Diff