summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@also>2011-08-06 00:59:46 +0200
committertv <tv@also>2011-08-06 00:59:46 +0200
commit9f653aa2cce166e79a7f050730eff6c10568fb5d (patch)
treed3e0d57f21584f68cfd38515b0e8ee6c894bd211
parentad398a0408a041b8760d6f2d6185c806c13b9542 (diff)
cholerab README: add conflicts
-rw-r--r--cholerab/README9
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
+