diff options
| author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-03-03 09:42:28 +0100 |
|---|---|---|
| committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-03-03 09:42:28 +0100 |
| commit | 3f048887a4bd12eb7d3ecd972560e2cdfef57405 (patch) | |
| tree | 01001596ca46d4d1786f00556d4635201a2dfb18 /proto.js | |
| parent | bdbe7ab02d91634f2a35b652151f567c86b0318b (diff) | |
| parent | 27c945b501562d8261eddf8dc7754ea9c2d1f502 (diff) | |
Merge branch 'master' of https://git.oftal.dk/munia
Conflicts:
src/task_proto.cc
Fixed conflict.
Diffstat (limited to 'proto.js')
0 files changed, 0 insertions, 0 deletions