]> git.pld-linux.org Git - packages/links2.git/commitdiff
- updated for 2.1pre17 auto/ac/links2-2_1pre17-1
authorSÅ‚awomir Paszkiewicz <paszczus@pld-linux.org>
Thu, 3 Mar 2005 19:00:25 +0000 (19:00 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    links2-ac.patch -> 1.3

links2-ac.patch

index 8a2bbb1427d685c27a3d6105243cc7c465f7f0f9..505e902aa8eac21d79323660796138e517a10991 100644 (file)
@@ -1,14 +1,19 @@
---- links-2.1pre16/configure.in.orig   2005-01-28 21:34:43.190597000 +0100
-+++ links-2.1pre16/configure.in        2005-01-28 21:47:18.645751112 +0100
-@@ -5,11 +5,7 @@
+diff -ur links-2.1pre17/configure.in links-2.1pre17.new/configure.in
+--- links-2.1pre17/configure.in        2005-02-24 16:17:57.000000000 +0000
++++ links-2.1pre17.new/configure.in    2005-03-03 18:56:08.093081944 +0000
+@@ -5,15 +5,7 @@
  
  AC_INIT(main.c)
  
+-<<<<<<< configure.in
 -<<<<<<< configure.in
 -AM_INIT_AUTOMAKE(links, 2.1pre15)
 -=======
- AM_INIT_AUTOMAKE(links, 2.1pre16)
+-AM_INIT_AUTOMAKE(links, 2.1pre16)
 ->>>>>>> 1.111
+-=======
+ AM_INIT_AUTOMAKE(links, 2.1pre17)
+->>>>>>> 1.116
  
  ACLOCAL="./missing aclocal"
  AUTOCONF="./missing autoconf"
This page took 0.073113 seconds and 4 git commands to generate.