lluis 6ef1d456dd fixed rebase conflicts

2013-09-06 14:00:11 +02:00

..

opencv2

fixed rebase conflicts

2013-09-06 14:00:11 +02:00