added protection to Makfile against deploying cvs conflicts
authorivan <ivan>
Wed, 15 Jun 2011 01:41:14 +0000 (01:41 +0000)
committerivan <ivan>
Wed, 15 Jun 2011 01:41:14 +0000 (01:41 +0000)
commitec2f9c4ac6aaf879abe61444041ca8739621a415
tree920b0c9d26448c9f9aa5cd6e3023a9bd1246185e
parent30929a2729c3e40beb5f54d0795857cbb36e0969
added protection to Makfile against deploying cvs conflicts
Makefile