added simple script to port trunk changes into branches
authorMartin Willi <martin@strongswan.org>
Fri, 3 Nov 2006 14:03:51 +0000 (14:03 -0000)
committerMartin Willi <martin@strongswan.org>
Fri, 3 Nov 2006 14:03:51 +0000 (14:03 -0000)
commitdf85984570323ff0393c8151aa702df25208befb
tree227df06a5c2fb8fbcd0c6bec33ae37b70480e7a7
parenta26e06c75a384dcdd63c58c9eccc701b56e3c93c
added simple script to port trunk changes into branches
scripts/merge [new file with mode: 0755]