Fix CREDITS, mailmap

oops
sir-pinecone · Aug 9, 2016 · 16db51f · 16db51f
1 parent 1f77a52
commit 16db51f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.mailmap b/.mailmap
@@ -162,4 +162,5 @@ hasufell <[email protected]>
 giann <[email protected]>
 fixit_friend <[email protected]>
 Brannock <[email protected]>
-adibis <[email protected]>
+xorxor <[email protected]>
+adibis <[email protected]>
diff --git a/crawl-ref/CREDITS.txt b/crawl-ref/CREDITS.txt
@@ -231,6 +231,7 @@
     Brennan Shacklett
     ShadyAmish
     Evan Shaw
+    Aditya Shevade
     Robert Shimmin
     Sigurd
     Edgar Simo