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
This commit is contained in:
Sam Hatchett
2013-07-19 13:27:26 -04:00
17 changed files with 534 additions and 267 deletions

View File

@@ -23,6 +23,7 @@ AUTHOR: L. Rossman
#include "text.h"
#include "types.h"
#include "funcs.h"
#define EXTERN extern
#include "hash.h"
#include "vars.h"