diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2012-09-27 13:18:45 -0400 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-09-27 13:18:45 -0400 |
commit | 6d39c9529d1018801a4fda95466bf8720416abad (patch) | |
tree | 6880f41a6368a6e130ee7ab428ae87698ce4930e /gitconfig.SAMPLE | |
parent | 6ec0fe522256e48f8ccc0204d7c4ed63a34d9ede (diff) | |
parent | 709bb01175c512d124da9874dcaea50022374715 (diff) | |
download | scala-6d39c9529d1018801a4fda95466bf8720416abad.tar.gz scala-6d39c9529d1018801a4fda95466bf8720416abad.tar.bz2 scala-6d39c9529d1018801a4fda95466bf8720416abad.zip |
Merge 2.10.x into master to fix breaking tests and keep things up-to-date.
Diffstat (limited to 'gitconfig.SAMPLE')
0 files changed, 0 insertions, 0 deletions