Changes in directory llvm/docs:
GettingStarted.html updated: 1.136.2.4 -> 1.136.2.5
---
Log message:
Remove another merge conflict marker.
---
Diffs of the changes: (+1 -5)
GettingStarted.html | 6 +-----
1 files changed, 1 insertion(+), 5 deletions(-)
Index: llvm/docs/GettingStarted.html
diff -u llvm/docs/GettingStarted.html:1.136.2.4
llvm/docs/GettingStarted.html:1.136.2.5
--- llvm/docs/GettingStarted.html:1.136.2.4 Thu Jul 27 01:50:11 2006
+++ llvm/docs/GettingStarted.html Thu Jul 27 02:26:00 2006
@@ -31,11 +31,7 @@
<li><a href="#installcf">Install the GCC Front End</a>
<li><a href="#config">Local LLVM Configuration</a>
<li><a href="#compile">Compiling the LLVM Suite Source Code</a>
-<<<<<<< GettingStarted.html
- <li><a href="#cross-compile">Compiling LLVM As A Cross-Compiler</a>
-=======
<li><a href="#cross-compile">Cross-Compiling LLVM</a>
->>>>>>> 1.139
<li><a href="#objfiles">The Location of LLVM Object Files</a>
<li><a href="#optionalconfig">Optional Configuration Items</a>
</ol></li>
@@ -1599,7 +1595,7 @@
<a href="mailto:[EMAIL PROTECTED]">Chris Lattner</a><br>
<a href="http://llvm.x10sys.com/rspencer/";>Reid Spencer</a><br>
<a href="http://llvm.org";>The LLVM Compiler Infrastructure</a><br>
- Last modified: $Date: 2006/07/27 06:50:11 $
+ Last modified: $Date: 2006/07/27 07:26:00 $
</address>
</body>
</html>
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
