diff options
| author | tv <tv@also> | 2011-08-06 00:59:46 +0200 |
|---|---|---|
| committer | tv <tv@also> | 2011-08-06 00:59:46 +0200 |
| commit | a8eb7d8634e7722592b5d2e02df2124a7d15e0c0 (patch) | |
| tree | cdd75d91ed5fb6ab299195bb20719292fe97ba1e /cholerab/README | |
| parent | 47217c36082cfd39bfb0a6f94579d3380c03d74a (diff) | |
cholerab README: add conflicts
Diffstat (limited to 'cholerab/README')
| -rw-r--r-- | cholerab/README | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cholerab/README b/cholerab/README index d6149751..7b53aeaa 100644 --- a/cholerab/README +++ b/cholerab/README @@ -61,3 +61,12 @@ - i.e. to start automatically at KREBS - the last stream should be playbacked - should be controlable by noise [see NOISE-STREAM-MODULE] + + +## merge conflicts below +view.py: contains view classes for cholerab +cholerab.py: main file + +start with : +python cholerab.py + |