[SCM] GeoGebra: Dynamic mathematics software for education branch, patch/version, updated. upstream/3.2.47.0+dfsg1-163-ge628a0f

[Giovanni Mascellani]

The following commit has been merged in the patch/version branch:
commit e628a0fcc1f0baa52191e23c78c5b28d70243db1
Merge: 1824b3830e9206feddf5961649db67ac00caaeac 4896c42db17a526df4a8fa382826c3f16231acab
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 11 12:05:20 2012 +0100

    Merge commit 'refs/top-bases/patch/version' into patch/version

diff --combined geogebra/GeoGebra.java
index 3d754ca,c503fc7..2a279c4
--- a/geogebra/GeoGebra.java
+++ b/geogebra/GeoGebra.java
@@@ -19,8 -19,8 +19,8 @@@ import java.net.URL
  public class GeoGebra extends Object {
  
  	// GeoGebra version
- 	public static final String BUILD_DATE = "25 December 2011";
- 	public static final String VERSION_STRING = "4.0.17.0";
+ 	public static final String BUILD_DATE = "10 January 2012";
+ 	public static final String VERSION_STRING = "4.0.19.0";
  	public static final String SPLASH_STRING = "splash40.png";
  	public static final String PREFERENCES_ROOT = "/geogebra40";
  	public static final String SHORT_VERSION_STRING = "4.0"; // used for online
@@@ -28,8 -28,6 +28,8 @@@
  	public static final boolean CAS_VIEW_ENABLED = false;
  	public static final boolean IS_PRE_RELEASE = !VERSION_STRING.endsWith(".0");
  
 +    public static final String DEBIAN_VERSION_STRING = GeoGebraDebian.DEBIAN_VERSION_STRING;
 +
  	// File format versions
  	public static final String XML_FILE_FORMAT = "4.0";
  	public static final String GGB_XSD_FILENAME = "ggb.xsd"; // for ggb files

-- 
GeoGebra: Dynamic mathematics software for education