[llvm-commits] [llvm] r100157 - in /llvm/trunk: ./ docs/ProgrammersManual.html

[Gabor Greif]

Author: ggreif
Date: Thu Apr  1 19:08:26 2010
New Revision: 100157

URL: http://llvm.org/viewvc/llvm-project?rev=100157&view=rev
Log:
remove these merge-tracking properties as they
might interfere with merges to other branches (as Dan pointed out)

Modified:
    llvm/trunk/   (props changed)
    llvm/trunk/docs/ProgrammersManual.html   (props changed)

Propchange: llvm/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo (removed)
@@ -1,2 +0,0 @@
-/llvm/branches/ggreif/InvokeInst-operands:98645-99398
-/llvm/branches/ggreif/const-CallSite:99517-100006

Propchange: llvm/trunk/docs/ProgrammersManual.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo (removed)
@@ -1,3 +0,0 @@
-/llvm/branches/ggreif/InvokeInst-operands/docs/ProgrammersManual.html:98645-99398
-/llvm/branches/ggreif/const-CallSite/docs/ProgrammersManual.html:99517-100006
-/llvm/trunk/docs/ProgrammersManual.html:70891