[Rivet-svn] r3804 - branches/2012-06-aidarivet

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue Jul  3 23:15:42 2012
New Revision: 3804

Log:
merge Changelog from trunk

Modified:
   branches/2012-06-aidarivet/ChangeLog

Modified: branches/2012-06-aidarivet/ChangeLog
==============================================================================
--- branches/2012-06-aidarivet/ChangeLog	Tue Jul  3 23:15:13 2012	(r3803)
+++ branches/2012-06-aidarivet/ChangeLog	Tue Jul  3 23:15:42 2012	(r3804)
@@ -4,7 +4,11 @@
 
 2012-06-29  Hendrik Hoeth <hendrik.hoeth at cern.ch>
 
-	* Create AIDA based Rivet branch and convert trunk to YODA
+	* Merge YODA branch into trunk. YODA is alive!!!!!!
+
+2012-06-26  Holger Schulz  <holger.schulz at physik.hu-berlin.de>
+
+	* Add ATLAS_2012_I1091481
 
 2012-06-20  Hendrik Hoeth <hendrik.hoeth at cern.ch>