Mercurial > hg > CbC > CbC_gcc

changeset 49:2e19f845ea37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modify
author kent <kent@cr.ie.u-ryukyu.ac.jp>
date Sun, 07 Feb 2010 17:56:25 +0900
parents 9907f3135723
children 4e0a8e84ee55
files .hgtags CbC-examples/quicksort/Makefile
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Feb 07 17:48:31 2010 +0900
+++ b/.hgtags	Sun Feb 07 17:56:25 2010 +0900
@@ -1,7 +1,3 @@
 a06113de4d676b497759e6a9bf820a208b02e09b gcc.4.4.0
 855418dad1a3a87de4782b8184eef35cd8812e23 gcc.4.4.2
-<<<<<<< local
-
-=======
 d096b2ff82d9016ec5bc3d0ba69810564d0c7437 gcc-4.4.3
->>>>>>> other
--- a/CbC-examples/quicksort/Makefile	Sun Feb 07 17:48:31 2010 +0900
+++ b/CbC-examples/quicksort/Makefile	Sun Feb 07 17:56:25 2010 +0900
@@ -1,8 +1,9 @@
 
-CbCC=../../../build_gcc/INSTALL_DIR/bin/gcc
+CbCC=../../BUILD/INSTALL_DIR/bin/gcc
 
 #CC=gcc
-CC=../../../build_gcc/INSTALL_DIR/bin/gcc
+#CC=../../../build_gcc/INSTALL_DIR/bin/gcc
+CC=../../BUILD/INSTALL_DIR/bin/gcc
 
 HEADERMAKER=../../CbC-scripts/make_headers.py2