resolving merge conflict

This commit is contained in:
andy
2008-06-17 12:09:22 +01:00
55 changed files with 858 additions and 871 deletions

View File

@ -2,6 +2,9 @@
# Build optional components (eg, may depend on third-party libraries)
set -x
# run from this directory only
cd ${0%/*} || exit 1
# build libccmio if required
if [ ! -e $FOAM_LIBBIN/libccmio.so ]
then