# HG changeset patch # User kent # Date 1265532985 -32400 # Node ID 2e19f845ea375ef3bf7528fed439ecab0c6e53b5 # Parent 9907f31357239add9f5ddbe9e46168d4b14a90df modify diff -r 9907f3135723 -r 2e19f845ea37 .hgtags --- 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 diff -r 9907f3135723 -r 2e19f845ea37 CbC-examples/quicksort/Makefile --- 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