Files
SingularityViewer/indra/newview/skins/default/xui
Aleric Inglewood 227c621dad Merge remote-tracking branch 'slb/master'
Conflicts:
	indra/newview/llnetmap.cpp
	indra/newview/llnetmap.h
	indra/newview/skins/default/xui/en-us/menu_mini_map.xml
2013-09-29 16:56:55 +02:00
..
2013-09-17 01:58:48 -04:00