summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonas Suhr Christensen <jsc@umbraculum.org>2012-05-17 12:10:57 +0200
committerJonas Suhr Christensen <jsc@umbraculum.org>2012-05-17 12:10:57 +0200
commit69f1a4dfc0d3a7a1462d87a31b11197a638c5746 (patch)
treeeb4be65262797896b928ab01bd5d1b12644cbe1b /.gitignore
parent2b542db3b553e73bdd58f54f657776715fd5472d (diff)
parentc2def65a701a973cde305d8c221d01beeb33eb84 (diff)
Merge branch 'master' of https://git.oftal.dk/munia
Conflicts: src/taskmanager.cc
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions