Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

…into cigaweed Conflicts: SIGNOFF
k4gi · Apr 4, 2014 · 66cd1b7 · 66cd1b7
2 parents 5ccbc9d + 2b8ff7e
commit 66cd1b7
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 71 deletions.
diff --git a/SIGNOFF b/SIGNOFF
@@ -41,3 +41,4 @@ Brandon Bergren (Bdragon) <[email protected]> / <[email protected]>
 Henrik "Tivec" Bergvin <[email protected]>
 FryCarson <[email protected]>
 TranquilMarmot (Nate Moore) <[email protected]>
+Stéphane Travostino <[email protected]>