From: achbed <github@achbed.org>
Date: Wed, 19 Nov 2014 20:51:18 +0000 (-0600)
Subject: Merge branch 'dev-jsonfeed' into dev-dsw
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ff1efe2fe82bfddcfb568bba49c0bb2fb1b46a04;p=deefuzzer.git

Merge branch 'dev-jsonfeed' into dev-dsw

Conflicts:
	deefuzzer/station.py
---

ff1efe2fe82bfddcfb568bba49c0bb2fb1b46a04
diff --cc deefuzzer/station.py
index abc10a0,b9b1810..ad8bbc5
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@@ -72,7 -72,8 +72,9 @@@ class Station(Thread)
      record_mode = 0
      run_mode = 1
      station_dir = None
 +    appendtype = 1
+     feed_json = 0
+     feed_rss = 1
  
      def __init__(self, station, q, logger, m3u):
          Thread.__init__(self)