GIT: conflict resolution

2012-09-17 12:03:11 +01:00
parent e6bc9ba2ae a4ac852e9c
commit 8489de277d
514 changed files with 13454 additions and 11215 deletions
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@ -22,4 +22,4 @@ LIB_LIBS = \
    -lincompressibleRASModels \
    -lcompressibleLESModels \
    -lincompressibleLESModels \
-    -lbasicThermophysicalModels
+    -lfluidThermophysicalModels