summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2017-05-11 10:26:34 +0200
committerraveit65 <[email protected]>2017-05-11 11:35:53 +0200
commit274eebcdc6fc8995985b4ba66a7649180da5b14d (patch)
tree7c04ba20634973bbae229d464d89b3f02d687c4e /configure.ac
parent523641e2353af088f074ee0e86fb0a3617c03a7e (diff)
downloadmate-themes-274eebcdc6fc8995985b4ba66a7649180da5b14d.tar.bz2
mate-themes-274eebcdc6fc8995985b4ba66a7649180da5b14d.tar.xz
release 3.22.11
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 d64e06b9..28dcb0a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,10 @@
AC_PREREQ(2.53)
+<<<<<<< HEAD
AC_INIT([mate-themes], [3.22.9], [http://www.mate-desktop.org])
+=======
+AC_INIT([mate-themes], [3.22.11], [http://www.mate-desktop.org])
+>>>>>>> b8765a9a... release 3.22.11
AC_CONFIG_SRCDIR([icon-themes])
AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz no-dist-gzip check-news])