summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-25 13:08:45 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-09-25 13:08:45 +1000
commit610c28452c6b3288feef0a8d6f35f43860e1b742 (patch)
treeb506bc21d954bea92b66785c91ac123f05a53725 /.mailmap
parent5695588407bd1f2b6c7ef3bdcf52d7b0e1063d67 (diff)
parenta908ded364a6f8b664c6b02552a909c143d21b19 (diff)
downloadscala-610c28452c6b3288feef0a8d6f35f43860e1b742.tar.gz
scala-610c28452c6b3288feef0a8d6f35f43860e1b742.tar.bz2
scala-610c28452c6b3288feef0a8d6f35f43860e1b742.zip
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.11.x-20140925
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions