Files
SingularityViewer/indra/newview/app_settings
Latif Khalifa e0077b6941 Merge remote-tracking branch 'lirusaito/master'
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
2013-04-23 12:17:08 +02:00
..
2013-03-05 10:17:08 -05:00
…
2012-07-03 07:51:03 +02:00
2012-07-16 19:33:44 -04:00
…