Commit fc06be61 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron

Merge branch 'master' of git@git.epn-campus.eu:LimaCameraFrelon

Conflicts:
	include/FrelonInterface.h
	sip/FrelonInterface.sip
	src/FrelonInterface.cpp
parents b9dae547 50fb1b99
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment