Martin Konecny 2a0c9769aa Merge branch '2.4.x' ...

Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	python_apps/pypo/liquidsoap_scripts/fdkaac.liq
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/telnetliquidsoap.py

2013-06-14 16:45:52 -04:00

..

configs

more structural organization of files/packages

2013-05-16 13:41:56 -04:00

install

Merge branch '2.4.x'

2013-06-14 16:45:52 -04:00

liquidsoap_scripts

Merge branch '2.4.x'

2013-06-14 16:45:52 -04:00

media

Use proper unit conventions for Kilo

2013-06-07 11:17:35 -04:00

recorder

Major reorganization of the pypo directory.

2013-05-16 13:22:15 -04:00

schedule

Merge branch '2.4.x'

2013-06-14 16:45:52 -04:00

tests

Ensure only telnetliquidsoap has telnet responsibilities

2013-05-16 16:19:00 -04:00

__init__.py

-add support for PyDev code analysis (need to make pypo directory a package)

2012-03-17 13:56:41 -04:00

airtime-liquidsoap

add parameter parsing to airtime-liquidsoap script.

2013-05-15 13:06:16 -04:00

airtime-playout

more structural organization of files/packages

2013-05-16 13:41:56 -04:00

AUTHORS

fix worst offenders of > 80 character row length

2013-04-25 22:32:27 -04:00

LICENSE

CC-2016: Rearrange python scripts for reusability

2011-03-24 00:00:46 -04:00

pypo.py

clean up some pylint warnings

2013-05-16 17:12:21 -04:00

pypocli.py

CC-5227 - Sometimes Liquidsoap telnet is unresponsive which causes all Pypo threads to block

2013-06-11 15:55:17 -04:00

pypomessagehandler.py

more lintian fixes

2013-05-16 17:37:01 -04:00

pypopush.py

remove commented code

2013-06-14 16:36:47 -04:00

timeout.py

remove useless code and imports

2013-06-12 17:36:24 -04:00