xinyang 1abe8dec17 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	main.cpp

2019-07-06 20:22:06 +08:00

..

include

verified something and made it possible to run on a OSX machine (videos input only)

2019-07-06 10:42:23 +08:00

src

Merge remote-tracking branch 'origin/master'

2019-07-06 20:22:06 +08:00

armor.Config

Cross plantform versiongit status !

2019-05-14 22:22:33 +08:00

energy.Config

win32 ver

2019-05-15 16:32:30 +08:00

libmvsdk.dylib

大符：云台摄像头

2019-07-06 12:10:50 +08:00

libMVSDK.so

update libMVSDK.so

2019-06-26 17:55:49 +08:00

MVCAMSDK_X64.lib

win64 MVCAMSDK_X64.lib

2019-05-21 21:17:54 +08:00