frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/tvdzwan/master'

Browse Source 
# Conflicts:
#	include/hyperion/Hyperion.h
#	libsrc/hyperion/CMakeLists.txt
#	libsrc/hyperion/Hyperion.cpp


Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e
This commit is contained in:
AEtHeLsYn
2016-03-09 19:25:04 +01:00
parent 5215e45f10 14fc1d9bb6
commit 9db45c0ffb
127 changed files with 3084 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -2,3 +2,5 @@
/build*
.DS_Store
libsrc/hyperion/ImageProcessor.cpp
libsrc/hyperion/CMakeLists.txt