added protection to Makfile against deploying cvs conflicts
authorivan <ivan>
Wed, 15 Jun 2011 01:41:06 +0000 (01:41 +0000)
committerivan <ivan>
Wed, 15 Jun 2011 01:41:06 +0000 (01:41 +0000)
commite40181be768dc726e52698c016e540a0b443b0f9
tree19e89a553128f41bef86be7d445c8074c8056de7
parent30e0af53bde61f5272c942814140b78ce44815a5
added protection to Makfile against deploying cvs conflicts
Makefile