From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Fri, 1 Jun 2012 18:50:04 +0000 (+0200)
Subject: Merge commit '6fca3ad9aa82eb4efa839f4'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bf79dab6b8e76c4e2de820687017e8377cfa0a8;p=thirdparty%2Fsarg.git

Merge commit '6fca3ad9aa82eb4efa839f4'

Conflicts:
	CMakeLists.txt
	configure.in
---

1bf79dab6b8e76c4e2de820687017e8377cfa0a8
diff --cc CMakeLists.txt
index 6b86033,5ff65b4..ca0a0d4
--- 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.2-pre1")
 +SET(sarg_REVISION "4-pre1")
  SET(sarg_BUILD "")
- SET(sarg_BUILDDATE "Sep-18-2010")
+ SET(sarg_BUILDDATE "Nov-22-2010")
  
  INCLUDE(AddFileDependencies)
  INCLUDE(CheckIncludeFile)