diff --git a/build.txt b/build.txt
index 7041f56061a66326871b58eaea8a684c948f15b3..328ee5ac1a96fa017b152c0b647e1d80813cc87b 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-10385
\ No newline at end of file
+10387
\ No newline at end of file
diff --git a/src/ui/DefaultText.java b/src/ui/DefaultText.java
index 34c98a50f8c84e39e9c3bd2d94a144fd11fa23bc..06841a1cd6421bda9f59689711457cdd1059ff49 100755
--- a/src/ui/DefaultText.java
+++ b/src/ui/DefaultText.java
@@ -49,8 +49,9 @@ package ui;
 
 public class DefaultText  {
 
-    public static String BUILD = "10384";
-	public static String DATE = "2012/07/23 10:55:46 CET";
+    public static String BUILD = "10386";
+	public static String DATE = "2012/08/23 11:17:52 CET";
+>>>>>>> .r9960
 
     public static StringBuffer sbAbout = makeAbout();