From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Fri, 1 Jun 2012 19:05:44 +0000 (+0200)
Subject: Merge commit '24eb624ea44bf4c82c602ce'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c06c641358a4edeef1395c7810ac4c1825f7c6e;p=thirdparty%2Fsarg.git

Merge commit '24eb624ea44bf4c82c602ce'

Conflicts:
	configure.in
---

4c06c641358a4edeef1395c7810ac4c1825f7c6e
diff --cc CMakeLists.txt
index 635d8c7,a541a3c..9a604d4
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,9 -1,9 +1,9 @@@
  CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
  PROJECT(sarg C)
  SET(sarg_VERSION 2)
 -SET(sarg_REVISION "3.3-pre1")
 +SET(sarg_REVISION "4-pre1")
  SET(sarg_BUILD "")
- SET(sarg_BUILDDATE "Dec-07-2011")
+ SET(sarg_BUILDDATE "Jan-06-2012")
  
  INCLUDE(AddFileDependencies)
  INCLUDE(CheckIncludeFile)
diff --cc configure.in
index 6c9187c,5e938d4..5f4e6e7
--- a/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
- dnl Process this file with autoconf to produce a configure script.
+ dnl Process this file with autoconf or autoreconf to produce a configure script.
 -AC_INIT([sarg],[2.3.3-pre1])
 +AC_INIT([sarg],[2.4-pre1])
  AC_CONFIG_SRCDIR([log.c])
  AC_CONFIG_AUX_DIR(cfgaux)