From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 26 Oct 2010 20:11:00 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.1'
X-Git-Tag: xorg/1.1.0~302
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8127963d297fab1ccb03df8f69cc9ddcdc645036;p=platal.git

Merge remote branch 'origin/platal-1.0.1'

Conflicts:
	ChangeLog
	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

8127963d297fab1ccb03df8f69cc9ddcdc645036
diff --cc ChangeLog
index d4d3faa,b8bbc3d..66f3651
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,5 +1,9 @@@
  ================================================================================
 +VERSION 1.1.0                                                         XX XX XXXX
 +
 +
 +================================================================================
- VERSION 1.0.1                                                         XX XX XXXX
+ VERSION 1.0.1                                                         26 10 2010
  
  New: