martin 2e4519f156 Merge branch 'cc-2015-on-reboot-resume-show' into devel ...

Conflicts:
	python_apps/media-monitor/airtime-media-monitor-init-d

2011-06-17 15:10:33 -04:00

..

api_clients

Merge branch 'cc-2015-on-reboot-resume-show' into devel

2011-06-17 15:10:33 -04:00

media-monitor

Merge branch 'cc-2015-on-reboot-resume-show' into devel

2011-06-17 15:10:33 -04:00

monit

cc-2055: switch to init.d

2011-06-16 20:01:37 -04:00

pypo

-added quotes to all paths in rm -rf statements

2011-06-17 11:16:27 -04:00

show-recorder

-added quotes to all paths in rm -rf statements

2011-06-17 11:16:27 -04:00

create-pypo-user.py

-create-pypo-user scripts missing an "import sys"

2011-06-16 17:30:16 -04:00

remove-pypo-user.py

-create-pypo-user scripts missing an "import sys"

2011-06-16 17:30:16 -04:00