summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2012-11-23 18:46:38 +0100
committerLukas Fleischer <calcurse@cryptocrack.de>2012-11-23 19:03:57 +0100
commit1f0f05ecc1aae138b700df9ff2200abf4fd110f2 (patch)
tree1430bfcd2f79c47b2329c40320e67ecf3fa783c2 /NEWS
parent7733d52f3249fee2a1d875d6923b8d2506dea5e4 (diff)
parent0ea23c24bf06e153bb075804e195e1733fd67d3f (diff)
downloadcalcurse-1f0f05ecc1aae138b700df9ff2200abf4fd110f2.tar.gz
calcurse-1f0f05ecc1aae138b700df9ff2200abf4fd110f2.zip
Merge branch 'maint'
Conflicts: src/day.c src/recur.c
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions