diff options
| author | krebs <krebs@UTART> | 2011-05-07 04:53:59 +0200 |
|---|---|---|
| committer | krebs <krebs@UTART> | 2011-05-07 04:53:59 +0200 |
| commit | bb26f83076b092a7ebca53482a2cdb6c86e9774b (patch) | |
| tree | 63bccb32d2615af44ce4e692f3f2737f668add93 | |
| parent | 9e99c0c0848ccf9af357514eccbd9c52d40a103a (diff) | |
| parent | 91b96d2405e37eb68a29c1cab653dbd80810a672 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rw-r--r-- | modules/temper/.gitignore | 1 | ||||
| -rwxr-xr-x | modules/webcams/cam1.sh | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/modules/temper/.gitignore b/modules/temper/.gitignore new file mode 100644 index 00000000..7e50641a --- /dev/null +++ b/modules/temper/.gitignore @@ -0,0 +1 @@ +temper diff --git a/modules/webcams/cam1.sh b/modules/webcams/cam1.sh new file mode 100755 index 00000000..9cf709e6 --- /dev/null +++ b/modules/webcams/cam1.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mplayer tv:// -tv driver=v4l2:width=320:height=240:device=/dev/video0 |