]> err.no Git - util-linux/commitdiff
projects / util-linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff12ee2 c986042)
Merge commit 'origin'
authorLaMont Jones <lamont@mmjgroup.com>
Wed, 8 Aug 2007 17:47:10 +0000 (11:47 -0600)
committerLaMont Jones <lamont@mmjgroup.com>
Wed, 8 Aug 2007 17:47:10 +0000 (11:47 -0600)
Conflicts:

configure.ac

1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
index 1cd1f1baca4aac2940f22d2c3d74b727747725ac,f0756ac27ea728bd4c254dd1715cd75ad9457f8b..4ccfaac13a92bbc94c597de87d8346d7501309bd
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,4 +1,4 @@@
- AC_INIT(util-linux, 2.13-rc2, kzak@redhat.com)
 -AC_INIT(util-linux-ng, 2.13-rc3, kzak@redhat.com)
++AC_INIT(util-linux, 2.13-rc3, kzak@redhat.com)
  
  AC_PREREQ(2.59)
  
Unnamed repository; edit this file 'description' to name the repository.