diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
commit | 29486d09fc74ca557f97136ac852767e48a981f2 (patch) | |
tree | 7ea4c6a266b67fd2e87c0b8ed6d6df798b5b637b /package/rsync/Makefile | |
parent | e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff) | |
parent | 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff) |
resolve merge conflict
Diffstat (limited to 'package/rsync/Makefile')
-rw-r--r-- | package/rsync/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 2b804f534..edc2bf47e 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rsync -PKG_VERSION:= 3.0.6 +PKG_VERSION:= 3.0.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= e9865d093a18e4668b9d31b635dc8e99 +PKG_MD5SUM:= b53525900817cf1ba7ad3a516ab5bfe9 PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net PKG_DEPENDS:= libpopt |