[cig-commits] commit: commiting merge

[Mercurial]

changeset:   86:7a689a5e914f
parent:      85:66c7976aa0f4
parent:      82:228f28ba9d4b
user:        rob at hijiki.maths.monash.edu.au
date:        Fri Oct 31 18:38:45 2008 +1100
description:
commiting merge


diff -r 66c7976aa0f4 -r 7a689a5e914f .hgtags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Fri Oct 31 18:38:45 2008 +1100
@@ -0,0 +1,1 @@
+c116bfc9b9dbab7305ace69ed864af70189310fd v1.2.0