Permalink
Browse files

resolve merge

--HG--
branch : trunk
  • Loading branch information...
2 parents acbee88 + 52a486b commit 19bed2298a3113f4845fd0c9f7b71f77ba765877 @ianb ianb committed Nov 20, 2009
Showing with 1 addition and 0 deletions.
  1. +1 −0 .hgtags
View
@@ -6,3 +6,4 @@ ffa882669ca9c70c1a6f279c8e5e45cb1be0cf10 1.2
4b660247ce567c2afa83d066d90ec28f210bdaf4 1.3.4
9a95f71c8cb21abef83c2313d21aeb5b0c5f41e3 1.4
83a2465f6537595808bfdc12defa9ac81e66de5d 1.4.1
+041b8bc5aacfb9715e0f004d26132f6fdfec1790 1.4.2

0 comments on commit 19bed22

Please sign in to comment.