summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2012-05-23 22:23:07 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2012-05-23 22:26:05 +0200
commitf5efea85a6874e4dcb206f91cedf29ef3d56f06b (patch)
treef678e72cb80226f178ef89a9faf52166701a64cf /.gitignore
parent7fa1f0e2aa70a610d6de76e2194857b2ddc36b18 (diff)
parentb4cefe2db9d45dfba9bfd633288a406a8ad2a4c3 (diff)
downloadcalcurse-f5efea85a6874e4dcb206f91cedf29ef3d56f06b.tar.gz
calcurse-f5efea85a6874e4dcb206f91cedf29ef3d56f06b.zip
Merge branch 'maint'
Conflicts: src/io.c src/notify.c src/utils.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions