Abhinav Shukla 722cecf0d3 Resolving merge conflict with dvbcolor and syncing with upstream		2016-07-22 19:51:51 -07:00
..
build	Added missing library for OCR	2016-07-21 14:59:56 -07:00
builddebug	Update Linux & Mac build	2016-07-05 18:10:19 +02:00
Makefile	Merge remote-tracking branch 'upstream/master'	2016-07-06 19:08:34 -07:00
pre-build.sh	Update Linux & Mac build	2016-07-05 18:10:19 +02:00