Aleric Inglewood 41f13dbf46 Merge branch 'master' of https://github.com/siana/SingularityViewer ...

Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.

2011-05-14 01:06:19 +02:00

..

CMakeLists.txt

Merge branch 'master' of https://github.com/siana/SingularityViewer

2011-05-14 01:06:19 +02:00

media_plugin_base.cpp

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

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

media_plugin_base.exp

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

2011-05-08 17:10:39 +02:00

media_plugin_base.h

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

2011-05-08 17:10:39 +02:00