Author: richard
Date: Tue Apr 7 02:46:54 2009
New Revision: 5215
URL: http://svn.slimdevices.com/jive?rev=5215&view=rev
Log:
r5...@harrypotter (orig r5202): tom | 2009-04-06 21:36:17 +0100
Bug:11595
Description:
Music IP works on controller again.
r5...@harrypotter (orig r5212): felix | 2009-04-07 10:34:37 +0100
Bug: 11569
Description: Fix zcip_action script to allow reconnection after link (wired or
wireless) was down.
r5...@harrypotter (orig r5213): felix | 2009-04-07 10:36:23 +0100
Bug: 11569
Description: Fix zcip_action script to allow reconnection after link (wired or
wireless) was down.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Apr 7 02:46:54 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5149
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5151
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5213
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action?rev=5215&r1=5214&r2=5215&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
Tue Apr 7 02:46:54 2009
@@ -26,8 +26,7 @@
then
echo $ip > "$IP.$interface"
fi
- ip address add dev $interface \
- scope link local "$ip/16" broadcast +
+ /sbin/ifconfig $interface $ip
route add default dev $interface
exit 0
;;
@@ -36,7 +35,7 @@
then
exit 1
fi
- exec ip address del dev $interface local $ip
+ /sbin/ifconfig $interface 0.0.0.0
exit 0
;;
esac
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=5215&r1=5214&r2=5215&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Tue Apr 7 02:46:54 2009
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r30"
+PR = "r31"
SRC_URI = " \
file://85-mtd.rules \
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=5215&r1=5214&r2=5215&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Tue Apr 7 02:46:54 2009
@@ -1782,7 +1782,7 @@
["pause"] = 'pause',
["stop"] = 'pause-hold',
["play"] = 'play',
- ["custom_mix"] = 'play-hold',
+ ["create_mix"] = 'play-hold',
["add"] = 'add',
["add_next"] = 'add-hold',
["go"] = 'go',
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
