Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

Conflicts: python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00 · 2013-05-22 18:08:14 -04:00 · 5c11f5fc72
commit 5c11f5fc72
parent 4e1dc6a86e 551d65ebf0
4 changed files with 39 additions and 2 deletions
--- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
@ -70,6 +70,11 @@ create_source()

 queue = add(!sources, normalize=false)

+<<<<<<< HEAD
+=======
+# the crossfade function controls fade in/out
+
+>>>>>>> 551d65ebf04d877bdba009a92c62bfa4f08eea9c
 output.dummy(fallible=true, queue)

 http = input.http_restart(id="http")