From be51253cb9a0894e4a0cae5635c202dfe3ce3831 Mon Sep 17 00:00:00 2001
From: Dominique Blouin <dominique.blouin@telecom-paristech.fr>
Date: Thu, 23 Aug 2012 09:18:15 +0000
Subject: [PATCH] update on build version: builder.txt
---
build.txt | 2 +-
src/ui/DefaultText.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.txt b/build.txt
index 328ee5ac1a..1ee06fe530 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 06841a1cd6..fe95268805 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();
--
GitLab