Merge branch 'develop' into feature/zveloc

Conflicts:
	src/PROPERTIES/properties_general.irp.f
This commit is contained in:
Anthony Scemama 2016-07-01 21:57:42 +02:00
commit f5c4500770
1 changed files with 0 additions and 1 deletions

View File

@ -64,7 +64,6 @@ BEGIN_PROVIDER [ double precision, pop_weight ]
END_PROVIDER
BEGIN_PROVIDER [ double precision, drift_mod, (size_drift_mod) ]
implicit none
BEGIN_DOC