diff options
| author | kali <kali@leap.se> | 2013-01-31 05:26:18 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-31 05:30:28 +0900 |
| commit | 555210630659018785fdb9d2318081a76b49fb4c (patch) | |
| tree | df7a51aaa32d9436a86881f9815d66a0f28773a5 /debian | |
| parent | 00276d12b44630315c19ff2cd0f906eac34d92cf (diff) | |
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! :)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 1 insertions, 1 deletions
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 |