jni/singleUsbJNI.cpp · master · Oliver Ford / ImageProc-Core

2 years ago

specgui @sv-ana-cdx-2 authored 2 years ago

https://DataAcqPCs:glpat-DjxxPgwKsNwCNh4zdPrM@git.ipp-hgw.mpg.de/ImageProc/ImageProc-core.git

Conflicts:
	src/imageProc/sources/capture/oceanOptics/OmniDriverCapture.java

a7ac7d4b

History

Merge branch 'master' of

specgui @sv-ana-cdx-2 authored 2 years ago

https://DataAcqPCs:glpat-DjxxPgwKsNwCNh4zdPrM@git.ipp-hgw.mpg.de/ImageProc/ImageProc-core.git

Conflicts:
	src/imageProc/sources/capture/oceanOptics/OmniDriverCapture.java