Merge branch 'develop' into documentation

Browse source

Conflicts:
	.gitignore
	ext/opencv/cvmat.cpp
	ext/opencv/opencv.cpp

...

This commit is contained in:

ser1zw 2014-01-14 17:45:45 +09:00

parent 3af45c76b4 0144f44d32

commit c88feb2c8e

105 changed files with 21911 additions and 347 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

41

ruby-opencv.gemspec

View file

File diff suppressed because one or more lines are too long