summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-15 16:40:52 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-15 16:40:52 +0100
commitd6d906e2ad7b459882d628dfb07ed30ee36ed26b (patch)
treeadcdd0ef5bfbff1a8df77b1420bf2c877cd00c82 /.mailmap
parent1a5af5210f640d900efac540d781a80c90959c22 (diff)
parent4624f64d9bd89cd80030b2c0f143cfe4d2197229 (diff)
downloadmana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.gz
mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.bz2
mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.xz
mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.zip
Merge branch '0.0.28'
Conflicts: po/POTFILES.in src/main.cpp src/main.h tmw.cbp
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions