Fixing merge conflicts for trunk.

Author: jsuereth

build.number

@@ -1,7 +1,7 @@
 #Tue Sep 11 19:21:09 CEST 2007
 version.major=2
-version.minor=9
-version.patch=2
+version.minor=10
+version.patch=0
 # This is the -N part of a version.  if it's 0, it's dropped from maven versions.
 version.bnum=0
 

build.xml

@@ -290,13 +290,6 @@ INITIALISATION
     <!-- some default in case something went wrong getting the revision -->
     <property name="git.describe" value="-unknown-"/>
 
-    <!-- Generating version string -->
-    <exec osfamily="unix" executable="tools/get-scala-revision" outputproperty="version.number" failifexecutionfails="false" />
-    <exec osfamily="windows" executable="tools/get-scala-revision.bat" outputproperty="version.number" failifexecutionfails="false" />
-    <!-- some default in case something went wrong getting the revision -->
-    <property name="version.number" value="-unknown-"/>
-    <property name="init.avail" value="yes"/>
-
     <!-- We use the git describe to determine the OSGi modifier for our build. -->
     <property
       name="maven.version.number"
@@ -307,15 +300,9 @@ INITIALISATION
     <property
       name="osgi.version.number"
       value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${version.suffix}-${git.commit.sha}"/>
-
-
-    <!-- And print-out what we are building -->
-    <echo message="       build time: ${time.human}" />
-    <echo message="     java version: ${java.vm.name} ${java.version}" />
-    <echo message="        java args: ${env.ANT_OPTS} ${jvm.opts}" />
-    <echo message="       javac args: ${javac.args}" />
-    <echo message="      scalac args: ${scalac.args}" />
-    <echo message="     build number: ${version.number}" />
+    <!-- some default in case something went wrong getting the revision -->
+    <property name="version.number" value="-unknown-"/>
+    <property name="init.avail" value="yes"/>
 
     <!-- Local libs (developer use.) -->
     <mkdir dir="${lib-extra.dir}"/>