Merge pull request nrc-cnrc#33 from nrc-cnrc/develop

Merging develop branch into master
taoqiuwang · Jan 21, 2016 · 13c71fa · 13c71fa
2 parents 6b1938d + 9e18712
commit 13c71fa
Show file tree

Hide file tree

Showing 195 changed files with 28,825 additions and 18,973 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ mortjob.mortran
 HEN_HOUSE/bin/
 HEN_HOUSE/lib/
 HEN_HOUSE/log/
+HEN_HOUSE/distribution/
 HEN_HOUSE/egs++/dso/
 HEN_HOUSE/mortran3/mortran3_*.f
 HEN_HOUSE/omega/beamnrc/tools/beam_build_*.f

diff --git a/HEN_HOUSE/doc/src/pirs701-egsnrc/figures/cs_all.pdf b/HEN_HOUSE/doc/src/pirs701-egsnrc/figures/cs_all.pdf
diff --git a/HEN_HOUSE/doc/src/pirs701-egsnrc/figures/cse_all.pdf b/HEN_HOUSE/doc/src/pirs701-egsnrc/figures/cse_all.pdf