Merge remote-tracking branch 'remotes/origin/master' into webif_js_rewrite
authorreichi <stephan@reichholf.net>
Tue, 8 Nov 2011 12:12:32 +0000 (13:12 +0100)
committerreichi <stephan@reichholf.net>
Tue, 8 Nov 2011 12:12:32 +0000 (13:12 +0100)
commitc39e5666ac976462cecd873b37fea3cba7740160
tree695e3ff1836429dcf9840a633b958c3c6f7a5ee8
parent876c505e16546d89de9f10c3a01546cba60da86e
parent700ac0d4c36036f84b48be4bc6046311d673693c
Merge remote-tracking branch 'remotes/origin/master' into webif_js_rewrite

Conflicts:
.project
webinterface/src/WebChilds/External/Example.py
webinterface/src/WebChilds/IPKG.py
webinterface/src/WebChilds/Toplevel.py
webinterface/src/WebComponents/Sources/LocationsAndTags.py
webinterface/src/WebComponents/Sources/MP.py
webinterface/src/WebComponents/Sources/ServicePlayable.py
webinterface/src/WebComponents/Sources/SwitchService.py
webinterface/src/WebComponents/Sources/WAPfunctions.py
webinterface/src/WebScreens.py
webinterface/src/__init__.py
webinterface/src/plugin.py
webinterface/src/web-data/objects.js
webinterface/src/web-data/statics.js
webinterface/src/web-data/timer.js
webinterface/src/web-data/tools.js
webinterface/src/web-data/tpl/default/index.html
webinterface/src/web-data/tpl/default/tplAbout.htm
webinterface/src/web-data/tpl/default/tplNavExtras.htm
webinterface/src/web-data/tpl/default/tplNavRadio.htm
webinterface/src/web-data/tpl/default/tplNavTv.htm
webinterface/src/web-data/tpl/default/tplTimerEdit.htm
webinterface/src/web-data/tpl/default/tplTimerList.htm
webinterface/src/web-data/tpl/default/tplTools.htm
webinterface/src/web-data/tpl/default/tplWebRemote.htm
.project
webinterface/src/__init__.py
webinterface/src/web-data/objects.js
webinterface/src/web-data/tpl/default/index.html
webinterface/src/web-data/tpl/default/tplWebRemote.htm