Merge remote-tracking branch 'upstream/develop' into pyapi_filters

This commit is contained in:
Sterling Harper 2016-09-29 16:22:10 -04:00
commit e464e22690
23 changed files with 687 additions and 696 deletions

File diff suppressed because one or more lines are too long

View file

@ -366,6 +366,7 @@ Core Classes
openmc.data.ThermalScattering
openmc.data.CoherentElastic
openmc.data.FissionEnergyRelease
openmc.data.DataLibrary
Angle-Energy Distributions
--------------------------