diff options
| author | Mirco Bauer <meebey@meebey.net> | 2011-08-11 21:10:21 +0200 |
|---|---|---|
| committer | Mirco Bauer <meebey@meebey.net> | 2011-08-11 21:10:21 +0200 |
| commit | 5157df7f461892cea1eb345bc4ecf6ec1ddb8e6c (patch) | |
| tree | 0fa2a995f144b2e6a21b34c29852e7dd3bd9151a /configure.in | |
| parent | 35f3a1e228bb8dccbdacdbb70d9bbe209aeb579c (diff) | |
| parent | 85bc08e2bbb037c091c14c3379780f43dc74aa4f (diff) | |
| download | mono-5157df7f461892cea1eb345bc4ecf6ec1ddb8e6c.tar.gz | |
Merge commit 'upstream/2.10.4' into master-experimental-patches/kfreebsd_support
Conflicts:
mono/mini/mini-amd64.h
mono/utils/mono-sigcontext.h
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index ff658805d3..92c3bb78b6 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mono,2.10.3) +AM_INIT_AUTOMAKE(mono,2.10.4) AM_MAINTAINER_MODE API_VER=2.0 |