summaryrefslogtreecommitdiff
path: root/debian/changelog
AgeCommit message (Collapse)Author
2013-01-31actually merge the release/v0.2.0 branch!kali
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! :)
2013-01-31Merge branch 'release/v0.2.0' into debiankali
2013-01-31bump versionkali
2013-01-30bumped version in changelog after v0.2.0 mergekali
2013-01-30remove dummy info and fix typoskali
2013-01-30changed pkg name in placeholderskali
2012-08-15update changelog to match changes doneMicah Anderson
2012-08-09bump changelogkali
2012-08-09remove debian/ from integration branch (moved to its own branch)kali
2012-08-09silly testkali
2012-08-09fix changelogkali
2012-07-22initial importkali