Files
SingularityViewer/indra/newview/app_settings
Aleric Inglewood 133391be90 Merge branch 'master' of https://github.com/siana/SingularityViewer
Resolved Conflicts:
	indra/newview/llviewermedia.cpp
	indra/plugins/base_media/CMakeLists.txt

Trivial fix for indra/newview/llviewermedia.cpp.
Moved 'prepare' dependency from base_media to
base_basic because media already depends on basic.
2011-05-10 04:46:58 +02:00
..
2011-04-26 17:25:57 -04:00
2010-04-02 02:48:44 -03:00
2011-03-01 06:21:21 +01:00
2011-04-30 22:00:12 +02:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2011-04-30 23:28:28 +02:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2011-04-27 00:32:12 +02:00
2010-04-02 02:48:44 -03:00
2010-11-17 03:51:58 -06:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00