Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'master' into develop
Merge branch 'fix/issue_47' into develop
Merge branch 'fix/issue_71' into develop

Conflicts:
	src/Makefile
	src/display_current_settings.c
	src/read_soilparam.c
	src/read_soilparam_arc.c
	src/vicNl.c
	src/vicNl.h
	src/vicNl_def.h
Merge branch 'fix/issue_81' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Merge branch 'fix/issue_87' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Merge branch 'fix/issue_88' into develop

Conflicts:
	src/vicNl.h
Merge branch 'fix/issue_89' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Added readme with instructions to set up an Xcode project for VIC
Fixed typo
Fixed typo
Merge pull request #1 from bartnijssen/feature/xcode

Feature/xcode
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/Makefile
	src/display_current_settings.c
	src/read_soilparam.c
	src/vicNl.c
	src/vicNl.h
	src/vicNl_def.h
Merge remote-tracking branch 'upstream/dev_5.0' into dev_5.0

Conflicts:
	src/Makefile
	src/display_current_settings.c
	src/read_soilparam.c
	src/vicNl.c
	src/vicNl.h
	src/vicNl_def.h
Removed RCS $Id$ string

Each VIC release already has an version ID string that can be accessed
by the user by using the '-v' commandline option.

Developers can use 'git describe' to get detailed information about the
release they are using. The $Id$ was redundant.
Merge pull request #122 from bartnijssen/dev5/issue_107

Dev5/issue 107
Merge branch 'master' into dev_5.0

Conflicts:
	src/ChangeLog
	src/global.h
	src/runoff.c
Fixed allocated type for tmaxhour and tminhour