Files
SingularityViewer/indra
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
..
2010-11-15 10:45:16 +01:00
2011-05-08 17:08:48 +02:00
2011-04-09 20:29:12 +02:00
2011-05-10 03:11:48 +02:00
2011-05-08 17:08:48 +02:00
2011-05-08 17:08:48 +02:00
2011-05-07 05:47:13 +02:00
2011-05-04 19:48:16 +02:00
2010-04-02 02:48:44 -03:00
2011-01-25 05:50:49 +01:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00