From 555210630659018785fdb9d2318081a76b49fb4c Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 31 Jan 2013 05:26:18 +0900 Subject: actually merge the release/v0.2.0 branch! My life has been a lie until this moment... I had done: git merge -s ours release/v0.2.0 to avoid deleting the debian folder... but that left the src untouched... Now I just rm'd the src folder and did a git checkout release/v0.2.0 src/ ... and merge happy! :) --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index cb4de3d5..f30d5b96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -leap-client (0.2.0~rc+d53729f) unstable; urgency=low +leap-client (0.2.0~rc+2329aea) unstable; urgency=low [ Kali ] * fixes to sphinxdoc install * merged release/v0.2.0 branch -- cgit v1.2.3