Merge branch 'rtx-1.1-lib-mods' into lemontiger-rtx

Conflicts:
	build/Xcode/epanet/epanet.xcodeproj/project.pbxproj
	include/epanet2.h
	src/epanet.c
	src/hydraul.c
	src/quality.c
	src/toolkit.h
	src/types.h
	src/vars.h

src/hydraul.c

@@ -58,6 +58,7 @@ AUTHOR:     L. Rossman
 #include "text.h"
 #include "types.h"
 #include "funcs.h"
+#define  EXTERN  extern
 #include "vars.h"
 
 #define   QZERO  1.e-6  /* Equivalent to zero flow */
@@ -1063,7 +1064,6 @@ void  tanklevels(long tstep)
       else if (Tank[i].V - D[n] <= Tank[i].Vmin) {
         Tank[i].V = Tank[i].Vmin;
       }
-      
       H[n] = tankgrade(i,Tank[i].V);
    }
 }                       /* End of tanklevels */