diff --git a/build.txt b/build.txt
index 328ee5ac1a96fa017b152c0b647e1d80813cc87b..1ee06fe53029900f1ef9d03163f139fb1f966d78 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-10387
\ No newline at end of file
+10388
\ No newline at end of file
diff --git a/src/ui/DefaultText.java b/src/ui/DefaultText.java
index 06841a1cd6421bda9f59689711457cdd1059ff49..fe95268805177b32b31a2c842d3dc5387e48f5ee 100755
--- a/src/ui/DefaultText.java
+++ b/src/ui/DefaultText.java
@@ -49,9 +49,9 @@ package ui;
 
 public class DefaultText  {
 
-    public static String BUILD = "10386";
-	public static String DATE = "2012/08/23 11:17:52 CET";
->>>>>>> .r9960
+    public static String BUILD = "10387";
+	public static String DATE = "2012/08/23 11:19:40 CET";
+
 
     public static StringBuffer sbAbout = makeAbout();