overte/interface/src/plugins
Brad Davis 2fa92af4ab Merge branch 'plugins2' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/plugins/Plugin.h
	interface/src/plugins/render/OculusBaseRenderPlugin.cpp
	interface/src/plugins/render/OculusBaseRenderPlugin.h
	interface/src/plugins/render/RenderPlugin.h
	interface/src/plugins/render/Tv3dRenderPlugin.cpp
	interface/src/plugins/render/Tv3dRenderPlugin.h
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/ApplicationOverlay.h
2015-04-30 11:04:06 -07:00
..
render
Plugin.cpp
Plugin.h
PluginManager.cpp
PluginManager.h