Merge branch '3.0.1' into developer

This commit is contained in:
Dhanya Maliakal 2017-12-12 09:05:50 +01:00
commit f6e1c21137

8
.gitignore vendored
View File

@ -1,18 +1,10 @@
.cproject .cproject
.project .project
bin/ bin/
calibrationWizards/
slsDetectorGui/
slsDetectorSoftware/
slsReceiverSoftware/
slsDetectorCalibration/
slsImageReconstruction/
.settings .settings
JCTBGui/
*.aux *.aux
*.log *.log
*.out *.out
*.toc *.toc
build build
tests
docs/ docs/