Siana Gearz 303c74f4c9 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer ...

Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp

2012-11-12 06:46:58 +01:00

..

base_basic

Media plugin update

2011-06-10 00:31:51 +02:00

base_media

Fail at configure time when openGL is not found

2012-07-07 23:17:22 +02:00

example_basic

Split plugin classes and derive AIFilePicker from BasicPluginBase (part 4).

2011-05-08 17:30:43 +02:00

example_media

Fixed further warnings reported by clang.

2012-07-03 00:24:15 +00:00

filepicker

Add support for uploading JP2 files.

2012-09-29 17:47:15 +02:00

gstreamer010

Split plugin classes and derive AIFilePicker from BasicPluginBase (part 4).

2011-05-08 17:30:43 +02:00

quicktime

Split plugin classes and derive AIFilePicker from BasicPluginBase (part 4).

2011-05-08 17:30:43 +02:00

webkit

Merge remote-tracking branch 'singu/master'

2012-10-04 16:17:41 -04:00

CMakeLists.txt

…