Author: bklaas
Date: Fri Apr 16 07:19:25 2010
New Revision: 8712
URL: http://svn.slimdevices.com/jive?rev=8712&view=rev
Log:
Bug: n/a
Description: fix merge error
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.6/trunk/squeezeplay/src/squeezeplay.version
7.6/trunk/squeezeplay/src/squeezeplay/VisualC/version.h
Modified: 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=8712&r1=8711&r2=8712&view=diff
==============================================================================
--- 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Fri Apr
16 07:19:25 2010
@@ -7,8 +7,8 @@
DISTRO = "squeezeos"
DISTRO_NAME = "Logitech SqueezeOS Linux"
-DISTRO_VERSION = "7.5"
-DISTRO_RELEASE = "7.5.1"
+DISTRO_VERSION = "7.6"
+DISTRO_RELEASE = "7.6.1"
MAINTAINER = "Logitech SqueezeOS <[email protected]>"
Modified: 7.6/trunk/squeezeplay/src/squeezeplay.version
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay.version?rev=8712&r1=8711&r2=8712&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay.version (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay.version Fri Apr 16 07:19:25 2010
@@ -1,1 +1,1 @@
-7.5.1
+7.6.0
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/VisualC/version.h
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/VisualC/version.h?rev=8712&r1=8711&r2=8712&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/VisualC/version.h (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/VisualC/version.h Fri Apr 16 07:19:25
2010
@@ -1,3 +1,3 @@
/* This file should be automatically generated with the SVN revision number,
patches welcome */
-#define JIVE_VERSION "7.5.1 r0"
+#define JIVE_VERSION "7.6.0 r0"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
