Merge git://github.com/AlericInglewood/SingularityViewer

Browse Source

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

...

This commit is contained in:

Siana Gearz

2011-05-08 19:39:32 +02:00

parent 7e75a897ca 92696623e0

commit e2e576e550

178 changed files with 2242 additions and 1971 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

0

indra/llvfs/llpidlock.cpp Executable file → Normal file