Created
June 8, 2012 20:58
-
-
Save paulp/2898095 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit a96a65e3fcd70ec9e14221867ae7a34a9287acd0 | |
| Merge: b24f58e8d7 59f0214e5d | |
| Author: Paul Phillips <[email protected]> | |
| Date: 28 minutes ago | |
| Merge branch 'master' into prime | |
| Conflicts: | |
| build.xml | |
| src/build/maven/maven-deploy.xml | |
| src/build/maven/scala-compiler-pom.xml | |
| src/build/pack.xml | |
| src/compiler/scala/reflect/internal/Trees.scala | |
| src/compiler/scala/reflect/internal/util/Origins.scala | |
| src/compiler/scala/reflect/makro/runtime/FrontEnds.scala | |
| src/compiler/scala/reflect/makro/runtime/Infrastructure.scala | |
| src/compiler/scala/reflect/runtime/JavaToScala.scala | |
| src/compiler/scala/reflect/runtime/ScalaToJava.scala | |
| src/compiler/scala/reflect/runtime/SymbolTable.scala | |
| src/compiler/scala/reflect/runtime/ToolBoxes.scala | |
| src/compiler/scala/reflect/runtime/Universe.scala | |
| src/compiler/scala/tools/ant/FastScalac.scala | |
| src/compiler/scala/tools/ant/Scalac.scala | |
| src/compiler/scala/tools/cmd/CommandLine.scala | |
| src/compiler/scala/tools/cmd/FromString.scala | |
| src/compiler/scala/tools/cmd/gen/Codegen.scala | |
| src/compiler/scala/tools/nsc/ClassLoaders.scala | |
| src/compiler/scala/tools/nsc/CompileServer.scala | |
| src/compiler/scala/tools/nsc/CompileSocket.scala | |
| src/compiler/scala/tools/nsc/Global.scala | |
| src/compiler/scala/tools/nsc/Main.scala | |
| src/compiler/scala/tools/nsc/ReflectMain.scala | |
| src/compiler/scala/tools/nsc/ScalaDoc.scala | |
| src/compiler/scala/tools/nsc/ToolBoxes.scala | |
| src/compiler/scala/tools/nsc/ast/DocComments.scala | |
| src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala | |
| src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala | |
| src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala | |
| src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala | |
| src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala | |
| src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala | |
| src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | |
| src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala | |
| src/compiler/scala/tools/nsc/doc/DocFactory.scala | |
| src/compiler/scala/tools/nsc/doc/DocParser.scala | |
| src/compiler/scala/tools/nsc/doc/Settings.scala | |
| src/compiler/scala/tools/nsc/doc/Uncompilable.scala | |
| src/compiler/scala/tools/nsc/doc/html/SyntaxHigh.scala | |
| src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala | |
| src/compiler/scala/tools/nsc/doc/model/TreeFactory.scala | |
| src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala | |
| src/compiler/scala/tools/nsc/interactive/BuildManager.scala | |
| src/compiler/scala/tools/nsc/interactive/CompilerControl.scala | |
| src/compiler/scala/tools/nsc/interactive/ContextTrees.scala | |
| src/compiler/scala/tools/nsc/interactive/Global.scala | |
| src/compiler/scala/tools/nsc/interactive/InteractiveReporter.scala | |
| src/compiler/scala/tools/nsc/interactive/Picklers.scala | |
| src/compiler/scala/tools/nsc/interactive/REPL.scala | |
| src/compiler/scala/tools/nsc/interactive/RangePositions.scala | |
| src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala | |
| src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala | |
| src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala | |
| src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala | |
| src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala | |
| src/compiler/scala/tools/nsc/interactive/tests/Tester.scala | |
| src/compiler/scala/tools/nsc/interactive/tests/core/AskCommand.scala | |
| src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala | |
| src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerRequestsWorkingMode.scala | |
| src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala | |
| src/compiler/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala | |
| src/compiler/scala/tools/nsc/interactive/tests/core/TestResources.scala | |
| src/compiler/scala/tools/nsc/interpreter/NamedParam.scala | |
| src/compiler/scala/tools/nsc/matching/ParallelMatching.scala | |
| src/compiler/scala/tools/nsc/plugins/Plugin.scala | |
| src/compiler/scala/tools/nsc/reporters/Reporter.scala | |
| src/compiler/scala/tools/nsc/scratchpad/Executor.scala | |
| src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala | |
| src/compiler/scala/tools/nsc/settings/MutableSettings.scala | |
| src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala | |
| src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | |
| src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala | |
| src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala | |
| src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala | |
| src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | |
| src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | |
| src/compiler/scala/tools/nsc/transform/UnCurry.scala | |
| src/compiler/scala/tools/nsc/typechecker/Contexts.scala | |
| src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| src/compiler/scala/tools/nsc/typechecker/Macros.scala | |
| src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala | |
| src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala | |
| src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala | |
| src/compiler/scala/tools/nsc/typechecker/Taggings.scala | |
| src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| src/compiler/scala/tools/nsc/util/ClassPath.scala | |
| src/compiler/scala/tools/nsc/util/Exceptional.scala | |
| src/compiler/scala/tools/nsc/util/FreshNameCreator.scala | |
| src/compiler/scala/tools/nsc/util/Statistics.scala | |
| src/compiler/scala/tools/nsc/util/TypeStrings.scala | |
| src/compiler/scala/tools/reflect/StdTags.scala | |
| src/compiler/scala/tools/reflect/package.scala | |
| src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala | |
| src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala | |
| src/library/scala/Predef.scala | |
| src/library/scala/collection/GenTraversableOnce.scala | |
| src/library/scala/collection/Traversable.scala | |
| src/library/scala/collection/TraversableOnce.scala | |
| src/library/scala/collection/TraversableProxyLike.scala | |
| src/library/scala/collection/generic/ClassTagTraversableFactory.scala | |
| src/library/scala/collection/generic/TraversableForwarder.scala | |
| src/library/scala/collection/generic/package.scala | |
| src/library/scala/collection/mutable/ArrayBuilder.scala | |
| src/library/scala/collection/mutable/ArrayOps.scala | |
| src/library/scala/collection/mutable/UnrolledBuffer.scala | |
| src/library/scala/collection/parallel/ParIterableLike.scala | |
| src/library/scala/collection/parallel/mutable/ParArray.scala | |
| src/library/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala | |
| src/library/scala/concurrent/Future.scala | |
| src/library/scala/ref/WeakReference.scala | |
| src/library/scala/reflect/api/Symbols.scala | |
| src/library/scala/reflect/api/Trees.scala | |
| src/library/scala/reflect/makro/Infrastructure.scala | |
| src/library/scala/reflect/package.scala | |
| src/library/scala/runtime/ScalaRunTime.scala | |
| src/library/scala/util/Marshal.scala | |
| src/library/scala/util/Origins.scala | |
| src/library/scala/util/Sorting.scala | |
| src/library/scala/util/control/Exception.scala | |
| src/partest/scala/tools/partest/CompilerTest.scala | |
| src/partest/scala/tools/partest/PartestTask.scala | |
| src/partest/scala/tools/partest/SigTest.scala | |
| src/partest/scala/tools/partest/nest/AntRunner.scala | |
| src/partest/scala/tools/partest/nest/ConsoleFileManager.scala | |
| src/partest/scala/tools/partest/nest/DirectRunner.scala | |
| src/partest/scala/tools/partest/nest/FileManager.scala | |
| src/partest/scala/tools/partest/nest/NestUI.scala | |
| src/partest/scala/tools/partest/nest/ReflectiveRunner.scala | |
| src/partest/scala/tools/partest/nest/SBTRunner.scala | |
| src/partest/scala/tools/partest/nest/Worker.scala | |
| src/reflect/scala/reflect/api/StandardNames.scala | |
| src/reflect/scala/reflect/internal/AnnotationCheckers.scala | |
| src/reflect/scala/reflect/internal/Constants.scala | |
| src/reflect/scala/reflect/internal/Definitions.scala | |
| src/reflect/scala/reflect/internal/StdNames.scala | |
| src/reflect/scala/reflect/internal/Symbols.scala | |
| src/reflect/scala/reflect/internal/Types.scala | |
| src/reflect/scala/reflect/internal/util/Origins.scala | |
| src/reflect/scala/reflect/runtime/SynchronizedOps.scala | |
| src/reflect/scala/reflect/runtime/SynchronizedSymbols.scala | |
| src/reflect/scala/reflect/runtime/SynchronizedTypes.scala | |
| src/repl/scala/repl/ExprTyper.scala | |
| src/repl/scala/repl/ILoop.scala | |
| src/repl/scala/repl/ILoopInit.scala | |
| src/repl/scala/repl/IMain.scala | |
| src/repl/scala/repl/Power.scala | |
| src/repl/scala/repl/ReplVals.scala | |
| src/scalacheck/org/scalacheck/Arbitrary.scala | |
| src/scalacheck/org/scalacheck/util/Buildable.scala | |
| test/files/jvm/manifests-new.check | |
| test/files/jvm/manifests-new.scala | |
| test/files/jvm/serialization-new.scala | |
| test/files/neg/interop_classtags_arenot_manifests.check | |
| test/files/neg/t3692-old.check | |
| test/files/neg/t5452-old.scala | |
| test/files/pos/implicits-new.scala | |
| test/files/pos/nothing_manifest_disambig-new.scala | |
| test/files/pos/spec-constr-new.scala | |
| test/files/pos/spec-doubledef-new.scala | |
| test/files/pos/spec-fields-new.scala | |
| test/files/pos/spec-params-new.scala | |
| test/files/pos/spec-sparsearray-new.scala | |
| test/files/pos/t3498-new.scala | |
| test/files/run/concretetypetags_core.check | |
| test/files/run/concretetypetags_core.scala | |
| test/files/run/concretetypetags_multi.check | |
| test/files/run/existentials3-new.check | |
| test/files/run/existentials3-new.scala | |
| test/files/run/interop_manifests_are_abstypetags.check | |
| test/files/run/interop_manifests_are_classtags.check | |
| test/files/run/interop_manifests_are_classtags.scala | |
| test/files/run/interop_manifests_are_typetags.check | |
| test/files/run/interop_manifests_are_typetags.scala | |
| test/files/run/interop_typetags_are_manifests.check | |
| test/files/run/macro-expand-nullary-generic.check | |
| test/files/run/macro-expand-tparams-explicit.check | |
| test/files/run/macro-expand-tparams-implicit.check | |
| test/files/run/macro-expand-tparams-prefix-a.check | |
| test/files/run/macro-expand-tparams-prefix-b.check | |
| test/files/run/macro-expand-tparams-prefix-c1.check | |
| test/files/run/macro-expand-tparams-prefix-c2.check | |
| test/files/run/macro-expand-tparams-prefix-d1.check | |
| test/files/run/macro-reify-typetag-notypeparams.check | |
| test/files/run/macro-reify-typetag-typeparams-tags.check | |
| test/files/run/macro-typecheck-macrosdisabled.check | |
| test/files/run/macro-typecheck-macrosdisabled2.check | |
| test/files/run/macro-undetparams-consfromsls.check | |
| test/files/run/macro-undetparams-implicitval.check | |
| test/files/run/macro-undetparams-macroitself.check | |
| test/files/run/patmat_unapp_abstype-new.scala | |
| test/files/run/reify_newimpl_25.check | |
| test/files/run/t1195-new.check | |
| test/files/run/t3507-new.check | |
| test/files/run/t4110-new.check | |
| test/files/run/toolbox_typecheck_macrosdisabled.check | |
| test/files/run/toolbox_typecheck_macrosdisabled2.check | |
| test/files/specialized/spec-matrix-new.scala | |
| test/files/speclib/instrumented.jar.desired.sha1 | |
| test/instrumented/library/scala/runtime/ScalaRunTime.scala | |
| test/instrumented/srt.patch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment