diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-11-30 16:27:28 +0100 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-11-30 16:27:28 +0100 |
| commit | cb916f274673322bb6bfe6ac7256d3526a15cbfa (patch) | |
| tree | 84024c4a3a59902ccb8247b7b62ca1231fde66ed /configure.ac | |
| parent | 5f942b123248712f86fe7bfc3724b899a2bc0844 (diff) | |
| parent | 922324553be10f847d4bdc3a177e641887a2921d (diff) | |
| download | gtk+-cb916f274673322bb6bfe6ac7256d3526a15cbfa.tar.gz | |
Merge branch 'master' into open-with-dialog
Conflicts:
docs/reference/gtk/gtk3-sections.txt
gtk/gtk.symbols
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c5d97ff4cd..d5ef2b7bb2 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ m4_define([gtk_major_version], [2]) m4_define([gtk_minor_version], [91]) -m4_define([gtk_micro_version], [5]) +m4_define([gtk_micro_version], [6]) m4_define([gtk_interface_age], [0]) m4_define([gtk_binary_age], [m4_eval(100 * gtk_minor_version + gtk_micro_version)]) @@ -61,8 +61,8 @@ cflags_set=${CFLAGS+set} AM_INIT_AUTOMAKE([1.10 no-define -Wno-portability dist-bzip2]) AM_MAINTAINER_MODE([enable]) -# Support silent build rules, requires at least automake-1.11. Enable -# by either passing --enable-silent-rules to configure or passing V=0 +# Support silent build rules, requires at least automake-1.11. Disable +# by either passing --disable-silent-rules to configure or passing V=1 # to make m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |