[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 6851f578ddfcf16cd7acf056f4d8de2196045063
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Oct 2 11:09:56 2009 +0300

    update merge script.

diff --git a/libclamav/c++/strip-llvm.sh b/libclamav/c++/strip-llvm.sh
index 85e23b0..5bc9004 100755
--- a/libclamav/c++/strip-llvm.sh
+++ b/libclamav/c++/strip-llvm.sh
@@ -30,3 +30,4 @@ done
 mkdir -p llvm/lib/Target/PIC16/AsmPrinter llvm/lib/Target/MSP430/AsmPrinter
 touch llvm/lib/Target/PIC16/AsmPrinter/Makefile llvm/lib/Target/MSP430/AsmPrinter/Makefile
 git add -f llvm/lib/Target/PIC16/AsmPrinter/Makefile llvm/lib/Target/MSP430/AsmPrinter/Makefile
+mv ../../.git/SQUASH_MSG ../../.git/MERGE_MSG

-- 
Debian repository for ClamAV