diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:56:11 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:56:11 +0100 |
| commit | 76cfbe09ef909c0eebf558dec3f5f4917dd14de2 (patch) | |
| tree | 8a5f39783b0f41e194a78c2b4fed152dddacdb2d /.mailmap | |
| parent | d2bec790d7a1d5a0adc9f97ec24f085cf86e3238 (diff) | |
| parent | 0e0affb76f7930994dcb972aead2df555288bad2 (diff) | |
| download | mana-76cfbe09ef909c0eebf558dec3f5f4917dd14de2.tar.gz mana-76cfbe09ef909c0eebf558dec3f5f4917dd14de2.tar.bz2 mana-76cfbe09ef909c0eebf558dec3f5f4917dd14de2.tar.xz mana-76cfbe09ef909c0eebf558dec3f5f4917dd14de2.zip | |
Merge branch 'origin/master'
Conflicts:
.mailmap
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,3 +1,4 @@ Bjørn Lindeijer <bjorn@lindeijer.nl> +Bjørn Lindeijer <thorbjorn.lindeijer@nokia.com> Majin Sniper <sniper@livecd.janhome.net> Victor Fury <frictor@unknown> |