hyperion.ng/.gitignore
AEtHeLsYn 9db45c0ffb Merge remote-tracking branch 'refs/remotes/tvdzwan/master'
# Conflicts:
#	include/hyperion/Hyperion.h
#	libsrc/hyperion/CMakeLists.txt
#	libsrc/hyperion/Hyperion.cpp


Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e
2016-03-09 19:25:04 +01:00

7 lines
99 B
Plaintext

/*.user
/build*
.DS_Store
libsrc/hyperion/ImageProcessor.cpp
libsrc/hyperion/CMakeLists.txt