diff options
author | Your Name <you@example.com> | 2013-03-15 06:02:25 -0400 |
---|---|---|
committer | Your Name <you@example.com> | 2013-03-15 06:02:25 -0400 |
commit | e1047af73a37bcb0a2395ab00e06997eb6a7b61a (patch) | |
tree | 7941af9029ea8eb0435f5cd4a97dff51cb062b0e /minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer | |
parent | d3e60d8fac6315692f64d52f1eec55511341e7cf (diff) | |
parent | 001bfd5f2b6890cafd209de4ea360927d4dd8a55 (diff) |
Merge branch 'master' of https://github.com/krebscode/painload
Conflicts:
minikrebs
Diffstat (limited to 'minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer')
-rw-r--r-- | minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer deleted file mode 100644 index 298b06fe..00000000 --- a/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer +++ /dev/null @@ -1,7 +0,0 @@ -config mjpg-streamer core - option enabled "1" - option device "/dev/video0" - option resolution "1280x720" - option fps "25" - option www "/www/webcam" - option port "80" |