Merge branch 'develop' into feature/add_FaceRecognizer

Browse source

Conflicts:
	Manifest.txt
	ruby-opencv.gemspec

...

This commit is contained in:

ser1zw 2013-05-20 23:46:14 +09:00

parent 336e9c4ad2 52410fc0f4

commit 8fc406e5fd

66 changed files with 269 additions and 161 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

31

ruby-opencv.gemspec

View file

File diff suppressed because one or more lines are too long