From e8f8c1a60b45d023744c41b7e77748512d1e8149 Mon Sep 17 00:00:00 2001
From: Dominique Blouin <dominique.blouin@telecom-paristech.fr>
Date: Thu, 23 Aug 2012 09:17:51 +0000
Subject: [PATCH] update on build version: builder.txt

---
 build.txt               | 2 +-
 src/ui/DefaultText.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.txt b/build.txt
index 7041f56061..328ee5ac1a 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 34c98a50f8..06841a1cd6 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();
     
-- 
GitLab