summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-07-03 01:49:55 +0900
committerKali Kaneko <kali@leap.se>2013-07-03 01:49:55 +0900
commitf6a7d3052dc9f1ca06bc655b64766e14b1e87a3a (patch)
tree5eca8f96e0718153b60cc7bd1b0cc1397351c358 /CHANGELOG
parent3364a21d2f38a4d09259221ceef9ab1a48f205f5 (diff)
parent1d30e2580592ef905d9b21c475459da1e40b1cd6 (diff)
Merge branch 'master' into develop
This is not the right flow; We should have tagged in the release-XXX branch instead. Merging master (where release-0.2.2 was tagged) as a workaround to get the version reporting right.
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions