comparison Makefile @ 575:36de5e30d3eb stable

doc: rename conflicting to divergent.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 27 Sep 2012 16:40:25 +0200
parents ca5bb72d14ae
children bfbd99b50f8f
comparison
equal deleted inserted replaced
574:4f5562c92630 575:36de5e30d3eb