summaryrefslogtreecommitdiffstats
path: root/rules/glib.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2010-08-25 08:28:00 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-10-11 15:50:12 +0200
commit2f8ae79b2f97108abf139cfa17b5d1e8459359c2 (patch)
treee9835be2ff74dbf3485b3ccfc575d2f5e0321c4b /rules/glib.make
parent33ef54d2db26c4789ad9078c6f287b5043a77c4d (diff)
downloadptxdist-2f8ae79b2f97108abf139cfa17b5d1e8459359c2.tar.gz
ptxdist-2f8ae79b2f97108abf139cfa17b5d1e8459359c2.tar.xz
[glib] version bump 2.25.12 -> 2.26.0
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/glib.make')
-rw-r--r--rules/glib.make4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/glib.make b/rules/glib.make
index 2ece7eeb3..2c3e4e6ea 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_GLIB) += glib
# Paths and names
#
ifdef PTXCONF_GLIB_EXPERIMENTAL
-GLIB_VERSION := 2.25.12
+GLIB_VERSION := 2.26.0
else
GLIB_VERSION := 2.24.1
endif
@@ -105,7 +105,7 @@ endif
# ----------------------------------------------------------------------------
ifdef PTXCONF_GLIB_EXPERIMENTAL
-GLIB_LIB_VERSION := 0.2512.0
+GLIB_LIB_VERSION := 0.2600.0
else
GLIB_LIB_VERSION := 0.2400.1
endif