[mpich2-commits] r5408 - in mpich2/trunk: . confdb maint

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-10-06 16:53:05 -0500 (Tue, 06 Oct 2009)
New Revision: 5408

Modified:
   mpich2/trunk/
   mpich2/trunk/confdb/
   mpich2/trunk/maint/Version
Log:
Merge r5406 from the mpich2-1.2 release branch, to keep trunk
up-to-date with the version information.



Property changes on: mpich2/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /mpich2/branches/dev/ckpt2:5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
   + /mpich2/branches/dev/ckpt2:5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406


Property changes on: mpich2/trunk/confdb
___________________________________________________________________
Modified: svn:mergeinfo
   - /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
   + /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406

Modified: mpich2/trunk/maint/Version
===================================================================
--- mpich2/trunk/maint/Version	2009-10-06 21:44:19 UTC (rev 5407)
+++ mpich2/trunk/maint/Version	2009-10-06 21:53:05 UTC (rev 5408)
@@ -1 +1 @@
-1.2rc1
\ No newline at end of file
+1.2