Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer

Browse Source

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

...

This commit is contained in:

Siana Gearz

2012-08-09 03:04:13 +02:00

parent c84e145557 769a7b89d2

commit 7743843a27

41 changed files with 3358 additions and 2289 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

3237

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

File diff suppressed because it is too large Load Diff