diff options
author | Asmir Mustafic <[email protected]> | 2014-06-12 07:59:25 -0300 |
---|---|---|
committer | Asmir Mustafic <[email protected]> | 2014-06-12 07:59:25 -0300 |
commit | 2908c7e2e5480503152f0f582837d1eeb5819751 (patch) | |
tree | 58ffd8e8cf41a7dbb76c59312d0273898dcc5ac8 /CREDITS | |
parent | e49c45913b9cff66e3ca25a17e98604e18388e1e (diff) | |
parent | f2c505017af7bcbd39d038b26943c6536721e298 (diff) |
Merge branch 'cognifloyd-master' into official-master
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -8,3 +8,4 @@ Rune Christensen [MrElectronic] <[email protected]> (contributor) Mišo Belica [miso-belica] <[email protected]> (contributor) Asmir Mustafic [goetas] <[email protected]> (contributor) KITAITI Makoto [KitaitiMakoto] <[email protected]> (contributor) +Jacob Floyd [cognifloyd] <[email protected]> (contributor) |