Merge branch 'master' of https://git.chaospott.de/andreas/pixelserver2
This commit is contained in:
@@ -23,6 +23,7 @@ Apps = [
|
||||
{"guiname": "Dual moodlight", "name": "bimood", "cmd": "apps/bimood", "persistent": False},
|
||||
{"guiname": "IDLE", "name": "pixelflut", "cmd": "apps/idle.py", "persistent": False},
|
||||
{"guiname": "IDLE2", "name": "idlec", "cmd": "apps/idle2"},
|
||||
<<<<<<< HEAD
|
||||
{"guiname": "YoutubeDL", "name": "youtubedl", "cmd": "apps/youtubedl.sh", "persistent": False},
|
||||
{"guiname": "Stream", "name": "stream", "cmd": "apps/stream.sh", "persistent": False},
|
||||
{"guiname": "Wget Video/Gif/Images", "name": "wget", "cmd": "apps/wget.sh", "persistent": False},
|
||||
@@ -30,6 +31,7 @@ Apps = [
|
||||
{"guiname": "SkyScrapper", "name": "sky", "cmd": "apps/weather/main.py"},
|
||||
{"guiname": "Strobo", "name": "strobo", "cmd": "apps/strobo.py", "persistent": False},
|
||||
{"guiname": "Snake", "name": "snake", "cmd": "apps/snake.py", "persistent": False},
|
||||
{"guiname": "Strobo", "name": "strobo", "cmd": "apps/strobo.py"},
|
||||
{"name": "pong", "cmd": "apps/pong.py"},
|
||||
{"name": "framebuffer", "cmd": ["apps/fbcp", "/dev/fb0"]},
|
||||
{"name": "gif", "cmd": "apps/gif.sh"},
|
||||
|
Reference in New Issue
Block a user