Mercurial > hg > truffle
annotate .hgtags @ 349:73278b62f36c
6718811: Mismerge of 6680469:macro.cpp
Summary: Fixed the mismerge by deleting the lines that were inadvertently left in place.
Reviewed-by: iveresov
author | ysr |
---|---|
date | Thu, 26 Jun 2008 11:43:34 -0700 |
parents | abe7181cbe8a |
children | 93435819dba2 |