Author: agrundman
Date: Tue Feb 21 08:18:40 2012
New Revision: 9614
URL: http://svn.slimdevices.com/jive?rev=9614&view=rev
Log:
Merge r9601, system_get_uuid_char
Modified:
7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/common.h
7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/ui/system.c
Modified: 7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/common.h
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/common.h?rev=9614&r1=9613&r2=9614&view=diff
==============================================================================
--- 7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/common.h
(original)
+++ 7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/common.h Tue Feb
21 08:18:40 2012
@@ -120,6 +120,7 @@
const char * system_get_machine(void);
const char * system_get_arch(void);
const char * system_get_version(void);
+const char * system_get_uuid_char(void);
/* time */
#if HAVE_CLOCK_GETTIME
Modified: 7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/ui/system.c
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/ui/system.c?rev=9614&r1=9613&r2=9614&view=diff
==============================================================================
--- 7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/ui/system.c
(original)
+++ 7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay/src/ui/system.c Tue
Feb 21 08:18:40 2012
@@ -29,6 +29,10 @@
const char * system_get_version(void) {
return JIVE_VERSION;
+}
+
+const char * system_get_uuid_char(void) {
+ return uuid;
}
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
