Merge remote-tracking branch 'lirusaito/master'

Browse Source

Conflicts:
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
	indra/newview/skins/default/xui/fr/panel_preferences_general.xml

...

This commit is contained in:

Latif Khalifa

2013-04-23 12:17:08 +02:00

parent 5396d17f2a 2b3350d686

commit e0077b6941

43 changed files with 3042 additions and 3219 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

2065

indra/newview/llviewermenu.cpp

File diff suppressed because it is too large Load Diff