[Commits] [svn:einsteintoolkit] manifest/branches/proposed/ (Rev. 246)

[ian.hinder at aei.mpg.de]

User: hinder
Date: 2013/08/16 09:49 AM

Modified:
 /branches/proposed/
  einsteintoolkit.th

Log:
 Merge remote-tracking branch 'origin/trunk' into proposed
 
 Conflicts:
 	einsteintoolkit.th

File Changes:

Directory: /branches/proposed/
==============================

File [modified]: einsteintoolkit.th
Delta lines: +1 -0
===================================================================
--- branches/proposed/einsteintoolkit.th	2013-08-15 00:56:53 UTC (rev 245)
+++ branches/proposed/einsteintoolkit.th	2013-08-16 14:49:56 UTC (rev 246)
@@ -407,6 +407,7 @@
 Carpet/CarpetTracker
 Carpet/CycleClock
 Carpet/LoopControl
+Carpet/Timers
 
 CarpetExtra/CarpetIntegrateTest
 CarpetExtra/CarpetProlongateTest