summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonas Suhr Christensen <jsc@umbraculum.org>2012-05-17 12:13:18 +0200
committerJonas Suhr Christensen <jsc@umbraculum.org>2012-05-17 12:13:18 +0200
commit88fc1bfddff7a078ffad767fef44858165c0a69e (patch)
tree11665a7f3420d6bf460fcb9f4433ec1774560d76 /.gitignore
parent69f1a4dfc0d3a7a1462d87a31b11197a638c5746 (diff)
parent4873e6df45424d2132dc9685f76bcbe2d9dd447e (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