Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorPootle daemon <pootle@pootle.sugarlabs.org>2011-05-16 15:16:30 (GMT)
committer Pootle daemon <pootle@pootle.sugarlabs.org>2011-05-16 15:16:30 (GMT)
commit63e8dcfeef3147524508c92d3868d90b05c5f9e3 (patch)
tree7e895bc978df197c1b2ae35a3034d86750310636 /configure.ac
parent16fadaff863bc0529d52418156ab81e9fb7f6cb6 (diff)
parenteb7ada51259747e39c064abb1eae9be7c01e71d3 (diff)
Commit from Sugar Labs: Translation System by user RafaelOrtiz.: 5 of 5 messages translated (0 fuzzy).
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index dd69bf4..8ddbf84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
AC_INIT([sugar-base],[0.87.2],[],[sugar-base])
+=======
+AC_INIT([sugar-base],[0.92.0],[],[sugar-base])
+>>>>>>> eb7ada51259747e39c064abb1eae9be7c01e71d3
AC_PREREQ([2.59])