From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 30 Oct 2007 04:39:33 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
X-Git-Tag: 1.1~46^2
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=33fede625f6a0eac733155b0276bf1b165068051;hp=-c;p=doldaconnect.git

Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
---

33fede625f6a0eac733155b0276bf1b165068051
diff --combined configure.in
index 47534f4,23ee9d5..4f35321
--- a/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
  AC_INIT(daemon/main.c)
- AM_INIT_AUTOMAKE([doldaconnect], [1.0])
+ AM_INIT_AUTOMAKE([doldaconnect], [1.1])
  AM_CONFIG_HEADER(config.h)
  
  DOLDA_AC_GROUP([Checking build chain])
@@@ -270,7 -270,6 +270,7 @@@ config/Makefil
  config/cmd/Makefile
  config/util/Makefile
  contrib/Makefile
 +contrib/doldaconnect.spec
  share/Makefile
  autopackage/doldacond.apspec
  autopackage/dolcon.apspec