Commit Graph

17 Commits

Author SHA1 Message Date
eldemet
b26e3dce49 Exclude windows sdk compiled folders 2016-07-15 09:47:38 +03:00
Sam Hatchett
79d215732c Merge branch 'coordinates-getter' into dev-2.1
Conflicts resolved in :
	build/Linux/Makefile
	build/Linux/Makefile_Rev
	build/Xcode/epanet.xcodeproj/project.pbxproj
	include/epanet2.h
2015-09-15 10:29:27 -04:00
Sam Hatchett
13f5741310 moving Xcode build files 2015-09-15 10:02:00 -04:00
Elad Salomons
dd286afe12 update include files 2015-06-12 23:44:29 +03:00
Sam Hatchett
87a8aaaef8 better gitignore file 2015-06-12 10:06:29 -04:00
Sam Hatchett
2563ae62c6 Merge remote-tracking branch 'origin/owa_next'
# Conflicts:
#	build/Linux/Makefile
#	build/Linux/Makefile_Rev
#	src/epanet.c
#	src/output.c
#	src/toolkit.h
2015-06-09 13:34:13 -04:00
Elad Salomons
2d60f11401 update gitignore 2015-05-27 16:45:37 -04:00
sam hatchett
1527868152 updating gitignore for xc5 2014-04-12 21:33:28 -04:00
sam hatchett
e16de988cf tank geometry and curve time series 2013-08-28 18:44:00 -04:00
Sam Hatchett
44e44e0809 testing code for sampletown 2013-02-05 09:49:59 -05:00
Sam Hatchett
4f693792c8 housekeeping - JC will need to fix this
moved visual studio project to its own build directory, added to
gitignore so we're not versioning the build products. i don't do
windows, so Jinduan will have to make sure everything still works with
this directory structure.
2013-01-31 15:13:40 -05:00
JinduanChen
719114cb2e Compile LemonTiger as a Win32 DLL. Use "LemonTiger.h" to access its functions. Added one new function - ENrunnextHQ(). 2013-01-28 15:14:10 -05:00
Sam Hatchett
ca2bc04cba resurrecting xcodeproj, fix gitignore 2013-01-24 09:10:23 -05:00
JinduanChen
4ae2f0e76c Some housekeeping 2013-01-24 00:53:12 -05:00
JinduanChen
9f8dcadb58 Solved the tank level issue. LemonTigerJ now gives right hyd/WQ results. 2013-01-24 00:48:19 -05:00
JinduanChen
2e22456896 Set up the environment for building with VS 2012 2013-01-22 11:27:12 -05:00
sam hatchett
d84d759e93 gitignore 2013-01-07 12:32:23 -05:00