diff options
| author | Linus Nordberg <linus@nordu.net> | 2011-09-28 13:10:12 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2011-09-28 13:10:12 +0200 |
| commit | dfadeec9cd47ce9f71f4bba7bc80efda4f8fd94a (patch) | |
| tree | 08df7446fc89cfe9572c0bbe8778b47443e403a9 /configure.ac | |
| parent | 52a34859e9d39a12bf5942ae2cee6fe55881f3a4 (diff) | |
| parent | 5e057b3271a05ba7e83fc6c0b43db8c6b9926123 (diff) | |
Merge with master. Conflicts:
ChangeLog
README
config.guess
config.sub
configure
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 3ff1cc3..570c5dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,8 @@ +<<<<<<< HEAD AC_INIT(radsecproxy, 1.5-dev, radsecproxy@uninett.no) +======= +AC_INIT(radsecproxy, 1.4.3, radsecproxy@uninett.no) +>>>>>>> master AC_CANONICAL_TARGET AM_INIT_AUTOMAKE AC_PROG_CC |