fixed merge
authorKevron Rees <tripzero.kev@gmail.com>
Sat, 16 Mar 2013 17:25:35 +0000 (10:25 -0700)
committerKevron Rees <tripzero.kev@gmail.com>
Sat, 16 Mar 2013 17:25:35 +0000 (10:25 -0700)
commit723b058de9c39fee9201bd0dac61374e55ee4fae
tree792a525d549fa20d3fd6aa36d366793fadf2cd5b
parentbfab43c265dba92c2740ae51c03fab791b6db443
parent996c437600d9babcc08d5a54e19e9b4b56cfe02f
fixed merge
plugins/obd2plugin/obd2source.cpp
plugins/websocketsourceplugin/websocketsource.cpp