diff options
| author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-05-17 12:10:57 +0200 |
|---|---|---|
| committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-05-17 12:10:57 +0200 |
| commit | 69f1a4dfc0d3a7a1462d87a31b11197a638c5746 (patch) | |
| tree | eb4be65262797896b928ab01bd5d1b12644cbe1b /AUTHORS | |
| parent | 2b542db3b553e73bdd58f54f657776715fd5472d (diff) | |
| parent | c2def65a701a973cde305d8c221d01beeb33eb84 (diff) | |
Merge branch 'master' of https://git.oftal.dk/munia
Conflicts:
src/taskmanager.cc
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions