still merging (what is the proper way of going about this whole merging process?)
authorBasilio <basilio@Basilios-MacBook-Pro.local>
Thu, 11 Aug 2011 20:05:30 +0000 (22:05 +0200)
committerBasilio <basilio@Basilios-MacBook-Pro.local>
Thu, 11 Aug 2011 20:05:30 +0000 (22:05 +0200)
commit5ac2abd1a5b05172a22d45c6318e0e9ff7dca9a4
tree923ef0ec343098b760f1c95c6046646722a7c5b6
parentde8cc4f69bf1d53aedef8aeb7a531e9bd5e995f0
still merging (what is the proper way of going about this whole merging process?)
MLDemos/mldemos.cpp
MLDemos_full.pro
_IOPlugins/PCAFaces/basicOpenCV.cpp
_IOPlugins/PCAFaces/basicOpenCV.h
_IOPlugins/PCAFaces/pluginPCAFaces.pro
_IOPlugins/PCAFaces/sampleManager.cpp