diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/olsrd/patches/patch-Makefile | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/olsrd/patches/patch-Makefile')
| -rw-r--r-- | package/olsrd/patches/patch-Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/olsrd/patches/patch-Makefile b/package/olsrd/patches/patch-Makefile index bfbc2e26f..1e0318707 100644 --- a/package/olsrd/patches/patch-Makefile +++ b/package/olsrd/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- olsrd-0.5.6-r2.orig/Makefile 2008-10-03 14:45:06.000000000 +0200 -+++ olsrd-0.5.6-r2/Makefile 2009-06-13 14:02:52.000000000 +0200 -@@ -143,7 +143,7 @@ rpm: +--- olsrd-0.6.0.orig/Makefile 2010-05-13 12:52:55.000000000 +0200 ++++ olsrd-0.6.0/Makefile 2010-10-10 14:34:11.000000000 +0200 +@@ -144,7 +144,7 @@ rpm: # This is quite ugly but at least it works ifeq ($(OS),linux) |