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 | ac5231442ee0a5f9621f6dfcb1de58bcd8b84e22 (patch) | |
| tree | ef1eb9dcfb24cd1892743aa253079d47ac44f0de /cholerab/README | |
| parent | dd4d6e1164c167f52f3aed21a484e138a9412af2 (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 + |