Author: titmuss
Date: Tue Jan 13 04:15:24 2009
New Revision: 3796
URL: http://svn.slimdevices.com?rev=3796&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3795): richard | 2009-01-13 12:14:23 +0000
Bug: N/A
Description:
Fix build error.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/watchdog.c
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 13 04:15:24 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:3753
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3785
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3795
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/squeezeplay/src/squeezeplay_squeezeos/src/watchdog.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/watchdog.c?rev=3796&root=Jive&r1=3795&r2=3796&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/watchdog.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/watchdog.c Tue
Jan 13 04:15:24 2009
@@ -5,7 +5,6 @@
*/
#include "common.h"
-#include "jive.h"
#include <linux/watchdog.h>
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c?rev=3796&root=Jive&r1=3795&r2=3796&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c Tue
Jan 13 04:15:24 2009
@@ -6,7 +6,6 @@
#include "common.h"
-#include "jive.h"
#include "wpa_ctrl.h"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
