Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add JavaConversions and JavaConverters concurrent.Map support. | Aleksandar Prokopec | 2012-03-28 | 2 | -24/+96 |
* | Rename ConcurrentTrieMap to concurrent.TrieMap. | Aleksandar Prokopec | 2012-03-27 | 17 | -162/+252 |
* | Merge branch 'master' into feature/pc-execution-contexts | Aleksandar Prokopec | 2012-03-21 | 318 | -1464/+5301 |
|\ | |||||
| * | Merge branch 'mar17-colorize' | Paul Phillips | 2012-03-18 | 7 | -0/+1275 |
| |\ | |||||
| | * | Library for ansi color management. | Paul Phillips | 2012-03-18 | 7 | -0/+1275 |
| * | | Merge remote-tracking branches 'axel22/feature/checkinit-transient' and 'jsue... | Paul Phillips | 2012-03-18 | 84 | -533/+1718 |
| |\ \ | |||||
| | * | | Added +: and :+ extractors to mirror append/prepend. | Josh Suereth | 2012-03-16 | 4 | -0/+34 |
| | |/ | |||||
| | * | Eliminating warnings in Cleanup. | Paul Phillips | 2012-03-16 | 3 | -74/+67 |
| | * | Testing compiler asSeenFrom directly. | Paul Phillips | 2012-03-16 | 7 | -18/+498 |
| | * | Added alternate test for SI-5545. | Paul Phillips | 2012-03-16 | 2 | -0/+8 |
| | *---------. | Merge remote-tracking branches 'VladUreche/feature/inheritdoc-clean', 'acruis... | Paul Phillips | 2012-03-16 | 61 | -382/+1085 |
| | |\ \ \ \ \ \ | |||||
| | | | | | | | * | Fixing merge conflicts for trunk. | Josh Suereth | 2012-03-16 | 2 | -18/+5 |
| | | | | | | | * | Fixed sha to not have the 'g' for git. | Josh Suereth | 2012-03-16 | 2 | -2/+3 |
| | | | | | | | * | Fixed maven deployment issues for new versioning scheme. | Josh Suereth | 2012-03-16 | 2 | -15/+20 |
| | | | | | | | * | Finished migrating to new versioning scheme | Josh Suereth | 2012-03-16 | 9 | -50/+158 |
| | | | | | | | * | properties loading is now maven/osgi version aware. yippie. | Josh Suereth | 2012-03-16 | 1 | -14/+13 |
| | | | | | | | * | Modified build for new versioning scheme. | Josh Suereth | 2012-03-16 | 3 | -3/+10 |
| | | | | | | | * | Moved to Mirco's versioning idea. | Josh Suereth | 2012-03-16 | 2 | -11/+19 |
| | | | | | | | * | Fixes to build numbering system for 2.9.x release | Josh Suereth | 2012-03-16 | 4 | -4/+53 |
| | | | | | | * | | Renamed concurrent trie source files. | Aleksandar Prokopec | 2012-03-16 | 2 | -0/+0 |
| | | | | | | * | | Renaming Ctrie to ConcurrentTrieMap. | Aleksandar Prokopec | 2012-03-16 | 11 | -144/+144 |
| | | | | | * | | | Remove confusing nightly.checkinit target that was setting checkinit in optim... | Hubert Plociniczak | 2012-03-15 | 1 | -6/+0 |
| | | | | * | | | | Remove assert given the test. Fixes #SI-5572. | Hubert Plociniczak | 2012-03-16 | 3 | -1/+34 |
| | | | | |/ / / | |||||
| | | | * | | | | Fixed broken tests | Alex Cruise | 2012-03-15 | 6 | -18/+19 |
| | | | * | | | | Tweaked deprecation annotations to avoid warning | Alex Cruise | 2012-03-15 | 2 | -2/+2 |
| | | | * | | | | Re-fixed 2.10-style literals. Oh, silly Windows and your line endings. | Alex Cruise | 2012-03-15 | 1 | -1/+1 |
| | | | * | | | | SI-1118: | Alex Cruise | 2012-03-15 | 5 | -493/+490 |
| | | | * | | | | Cleaned up failed manual patch | Alex Cruise | 2012-03-15 | 1 | -459/+459 |
| | | | * | | | | SI-1118 WIP | Alex Cruise | 2012-03-15 | 23 | -68/+168 |
| | | | * | | | | SI-1118 WIP | Alex Cruise | 2012-03-15 | 2 | -0/+0 |
| | | * | | | | | Merged and cleaned the 'feature/inheritdoc' branch | Vlad Ureche | 2012-03-16 | 9 | -89/+503 |
| | * | | | | | | Revert "More uniformity for the parser." | Paul Phillips | 2012-03-16 | 3 | -51/+14 |
| | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge pull request #281 from VladUreche/hack/verify-script | Josh Suereth | 2012-03-16 | 1 | -5/+5 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Adapted tools/verify-jar-cache for Ubuntu | Vlad Ureche | 2012-03-16 | 1 | -5/+5 |
| | | | |_|_|/ | | | |/| | | | |||||
| | * / | | | | Finish fixing range positions. | Paul Phillips | 2012-03-16 | 5 | -3/+7 |
| | |/ / / / | |||||
| * / / / / | Simplify check for transient fields in mixin. | Aleksandar Prokopec | 2012-03-16 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | More uniformity for the parser. | Paul Phillips | 2012-03-16 | 3 | -14/+51 |
| * | | | | New option -Ypos-debug, and fixed range position breakage. | Paul Phillips | 2012-03-15 | 17 | -75/+136 |
| * | | | | Merge remote-tracking branches 'axel22/feature/checkinit-transient' and 'lryt... | Paul Phillips | 2012-03-15 | 224 | -873/+2224 |
| |\ \ \ \ | |||||
| | * | | | | create relative symlinks in ant scripts | Lukas Rytz | 2012-03-15 | 2 | -2/+2 |
| | | |/ / | | |/| | | |||||
| | * | | | Whitespace and a couple checkfile updates. | Paul Phillips | 2012-03-14 | 6 | -34/+34 |
| | * | | | Merge branch 'master' into merge-inline | Paul Phillips | 2012-03-14 | 1 | -1/+0 |
| | |\ \ \ | |||||
| | | * | | | Eliminate build-breaking import. | Paul Phillips | 2012-03-14 | 1 | -1/+0 |
| | * | | | | The rest of the inline classes. | Paul Phillips | 2012-03-14 | 13 | -13/+8 |
| | * | | | | Merge remote-tracking branch 'odersky/topic/inline' into merge-inline | Paul Phillips | 2012-03-14 | 162 | -649/+1568 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Allows case classes as value classes | Martin Odersky | 2012-03-07 | 5 | -12/+138 |
| | | * | | | New starr which has java.io.Serializable as a universal trait | Martin Odersky | 2012-03-06 | 7 | -7/+7 |
| | | * | | | Make scala.io.Serializable a universal trait. | Martin Odersky | 2012-03-06 | 1 | -2/+3 |
| | | * | | | Fixes to value classes: Flags now double definitions, private constructors as... | Martin Odersky | 2012-03-06 | 75 | -168/+199 |
| | | * | | | Added check that primary constructor of a value class must be public. | Martin Odersky | 2012-03-05 | 2 | -6/+15 |