fixed some previous merge bugs that may have broken building a few plugins. also...
authorKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 6 Jun 2013 20:43:28 +0000 (13:43 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 6 Jun 2013 20:43:28 +0000 (13:43 -0700)
commit058c15877ffb2c29b136e918ada751224c68120e
treef6854565d21737f739a1526f68471fcb8c51b6ac
parent105c25e653833ab0c367a5a4275b5ab9babc95b9
fixed some previous merge bugs that may have broken building a few plugins.  also added support for uuid source filtering in get requests
ambd/core.cpp
lib/abstractroutingengine.h
plugins/dbus/abstractdbusinterface.cpp
plugins/websocketsourceplugin/websocketsource.cpp