summaryrefslogtreecommitdiff
path: root/test/files
Commit message (Expand)AuthorAgeFilesLines
* Closes SI-5821.Hubert Plociniczak2012-05-244-1/+19
* Merge pull request #593 from som-snytt/ticket/5760-pkgobj-warnAdriaan Moors2012-05-213-0/+26
|\
| * SI-5760: Improve error message for package$Klass conflict with KlassSom Snytt2012-05-203-0/+26
* | Merge pull request #591 from retronym/ticket/3888Adriaan Moors2012-05-211-0/+16
|\ \
| * | Test case closes SI-3880.Jason Zaugg2012-05-201-0/+16
| |/
* | Merge pull request #587 from retronym/ticket/5125Adriaan Moors2012-05-214-0/+72
|\ \
| * | Improve test for SI-5125.Jason Zaugg2012-05-201-1/+1
| * | Fix @varargs forwarder generation in the presence of nested templates.Jason Zaugg2012-05-204-0/+72
| |/
* | Merge pull request #576 from axel22/issue/4717Adriaan Moors2012-05-211-0/+35
|\ \ | |/ |/|
| * Fixes SI-4717.Aleksandar Prokopec2012-05-181-6/+2
| * Add more logging.Aleksandar Prokopec2012-05-151-0/+39
* | Merge pull request #581 from lrytz/t4812-uncAdriaan Moors2012-05-191-0/+4
|\ \
| * | Fix 4812Lukas Rytz2012-05-191-0/+4
* | | Merge pull request #578 from lrytz/wip/t5044-squashedAdriaan Moors2012-05-193-1/+23
|\ \ \
| * | | better feedback for SI-5044Lukas Rytz2012-05-183-1/+23
* | | | Merge pull request #577 from lrytz/wip/t2488Adriaan Moors2012-05-194-0/+58
|\ \ \ \
| * | | | Fix SI-2488Lukas Rytz2012-05-184-0/+58
* | | | | Merge pull request #568 from hubertp/issue/5801Adriaan Moors2012-05-192-0/+38
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixes SI-5801, error messages regression. Review by @adriaanmHubert Plociniczak2012-05-182-0/+38
* | | | | Merge pull request #574 from axel22/issue/4461Josh Suereth2012-05-182-1/+9
|\ \ \ \ \
| * | | | | Fixes SI-4461.Aleksandar Prokopec2012-05-182-1/+9
* | | | | | Merge pull request #572 from lrytz/wip/t5544Adriaan Moors2012-05-186-0/+27
|\ \ \ \ \ \
| * | | | | | Fix SI-5544Lukas Rytz2012-05-186-0/+27
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #569 from phaller/wip-sip14-fixes-newAdriaan Moors2012-05-183-12/+88
|\ \ \ \ \ \
| * | | | | | SIP-14: clean ups and fixesphaller2012-05-173-12/+88
* | | | | | | Merge pull request #571 from lrytz/wip/t4138Josh Suereth2012-05-182-0/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix 4138Lukas Rytz2012-05-182-0/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #567 from lrytz/wip/t3488Josh Suereth2012-05-182-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Test case for SI-3844 - fixed by #virtpatmat @adriaanmLukas Rytz2012-05-162-0/+8
| |/ / / /
* | | | | Merge pull request #566 from lrytz/wip/t4928Adriaan Moors2012-05-183-6/+15
|\ \ \ \ \
| * | | | | Fix SI-4928Lukas Rytz2012-05-163-6/+15
| | |_|/ / | |/| | |
* | | | | Merge pull request #563 from milessabin/feature/enrich-gentraversablesJosh Suereth2012-05-172-0/+34
|\ \ \ \ \
| * | | | | Added infrastructure to enable easy enrichment of GenTraversables.Miles Sabin2012-05-172-0/+34
| | |/ / / | |/| | |
* / | | | A band-aid solution for SI-5803.Jason Zaugg2012-05-172-0/+8
|/ / / /
* | | | Merge pull request #558 from lrytz/wip/t5259Josh Suereth2012-05-161-0/+21
|\ \ \ \
| * | | | Fix SI-5259Lukas Rytz2012-05-151-0/+21
* | | | | Merge pull request #557 from lrytz/wip/t5610Josh Suereth2012-05-162-0/+36
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix for SI-5610Lukas Rytz2012-05-152-0/+36
| |/ / /
* | | | Removing more unneeded code.Paul Phillips2012-05-156-102/+5
* | | | Test adjustments.Paul Phillips2012-05-151-1/+3
* | | | Removing extraneous files.Paul Phillips2012-05-1512-916/+0
* | | | Debugging output tweaks.Paul Phillips2012-05-141-1/+1
|/ / /
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
*-----. \ \ Merge commit 'refs/pull/547/head'; commit 'refs/pull/548/head'; commit 'refs/...Paul Phillips2012-05-147-0/+55
|\ \ \ \ \ \
| | | | * | | Better fix for SI-5676. Review by @paulpHubert Plociniczak2012-05-143-0/+28
| | | | |/ /
| | | * / / Closes SI-5796.Hubert Plociniczak2012-05-141-0/+8
| | | |/ /
| | * | | fix SI-5384Lukas Rytz2012-05-141-0/+7
| * | | | Added test case for commit f7d5f45 (re SI-5552)Erik Osheim2012-05-142-0/+12
|/ / / /
| | | |
| \ \ \
*-. \ \ \ Merge commit 'refs/pull/543/head'; commit 'refs/pull/544/head'; commit 'refs/...Paul Phillips2012-05-1318-7/+163
|\ \ \ \ \
| | * | | | Test case closes SI-5137.Jason Zaugg2012-05-131-0/+17
| |/ / / /
| * | | | Merge branch 'master' of https://github.com/scala/scalaPaul Phillips2012-05-124-2/+22
| |\| | |