From: Gabor Greif <ggreif@gmail.com>
Date: Fri, 2 Apr 2010 00:08:26 +0000 (+0000)
Subject: remove these merge-tracking properties as they
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9c0012e738a9c51e5a2d1a32d88c9a6b4d547195;p=oota-llvm.git

remove these merge-tracking properties as they
might interfere with merges to other branches (as Dan pointed out)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100157 91177308-0d34-0410-b5e6-96231b3b80d8
---