Merge remote-tracking branch 'upstream/master'

Browse Source

...

This commit is contained in:

Damian Zhaoying

2012-08-03 11:05:30 -03:00

parent a673496ed3 2c65da3397

commit 0a8cd6d03d

11 changed files with 2510 additions and 1898 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

3222

indra/newview/skins/default/xui/en-us/strings.xml

File diff suppressed because it is too large Load Diff