luoliangyi 3aceb91b4f Merge branch 'master' of http://192.168.100.140:8099/sane/code_app ... # Conflicts: # modules/imgproc/HGImgProc.cpp		2022-06-14 17:12:38 +08:00
..
base	实现水印功能	2022-06-13 19:56:43 +08:00
imgfmt	1）将ini功能独立到HGIni.h文件	2022-05-30 19:01:23 +08:00
imgproc	Merge branch 'master' of http://192.168.100.140:8099/sane/code_app	2022-06-14 17:12:38 +08:00
sane_user	编译麒麟系统aarch64版本第三方库	2022-05-24 12:02:00 +08:00
twain_user	整理websdk目录，方便V1和V2版本管理	2022-05-23 10:35:42 +08:00