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
This commit is contained in:
AEtHeLsYn
2016-03-09 19:25:04 +01:00
127 changed files with 3084 additions and 443 deletions

View File

@@ -1,10 +1,10 @@
{
"name" : "Snake",
"name" : "Snake",
"script" : "snake.py",
"args" :
{
"rotation-time" : 10.0,
"color" : [255, 0, 0],
"percentage" : 25
"rotation-time" : 12.0,
"color" : [255, 0, 0],
"percentage" : 10
}
}