Merge branch 'v1.4.0-release'

cyclus · Oct 28, 2016 · 627e8a3 · 627e8a3
2 parents b8aac14 + 73f2714
commit 627e8a3
Show file tree

Hide file tree

Showing 177 changed files with 16,266 additions and 3,360 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,13 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+# only allow single line functions if they are inlined in class def'n
+AllowShortFunctionsOnASingleLine: Inline
+# do not force new line after template declarations
+AlwaysBreakTemplateDeclarations: false
+# Automatically detect whether a given fuction's arguments are one-per-line
+ExperimentalAutoDetectBinPacking: true
+# Use C++11 standard
+Standard:        Cpp11
+...
+
diff --git a/.gitignore b/.gitignore
@@ -23,8 +23,12 @@ suffix.h
 *.tex
 src/Core/Utility/Env.cpp
 src/cyclus_nuc_data.h5
+stubs/stub_version.h
 src/env.cc
 src/version.cc
 share/cyclus_nuc_data.h5
 src/pyne_decay.h
 src/pyne_decay.cc
+src/hdf5_back.cc
+share/dbtypes.json
+tests/db.h5
diff --git a/.travis-install.sh b/.travis-install.sh
diff --git a/.travis.yml b/.travis.yml
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -9,8 +9,11 @@ order):
 * Robert Flanagan
 * Matthew Gidden
 * Katy Huff
+* Meghan McGarry
+* Baptiste Mouginot
+* Arielle Opotowsky
 * Olzhas Rakhimov
 * Anthony Scopatz
 * Zach Welch
 * Paul P.H. Wilson
-* John Xia
+* John Xia