Changeset: 2945cd4d6dfc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2945cd4d6dfc Modified Files: .hgtags Branch: rdf Log Message:
Merge with the fix of Sjeord on hgtags diffs (17 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -506,13 +506,7 @@ d762ae2e83bd42a48aebf0ebb051a643f77f77d7 6f4501510506b9f074351d5b592a2a745b296571 Oct2012_3 4233be3c7f49f704e5ed466d2c1836c9dcfbb9f7 Oct2012_release 3c157ea4be5369d5718c7d578f10c0b934fbf2e6 Oct2012_release -<<<<<<< /export/scratch2/duc/work/MonetRDF/MonetDB-hg/.hgtags 525f227382ddb8f5377114d11c3b030865493f42 RDF_Module_with_Raptor2 -======= 55c1892e82a764a7a6003dded13a6228de3d1661 Oct2012_5 5ba19bc11f7691610501c95ba8d0f1d9e5083a94 Oct2012_SP1_release -<<<<<<< /export/scratch2/duc/work/MonetRDF/MonetDB-hg/.hgtags ->>>>>>> /tmp/.hgtags~other.n2Hc7T -======= c341b78e1c2e38445f43bd3ec89fdf40792bed01 Feb2013_root ->>>>>>> /tmp/.hgtags~other.wca4Mz _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
