merged master

AUTHORS

doc/Doxyfile.in

examples/DiscPatch/GravityOnly/README

examples/DiscPatch/GravityOnly/disc-patch.yml

examples/DiscPatch/GravityOnly/makeIC.py

examples/DiscPatch/GravityOnly/run.sh

examples/DiscPatch/GravityOnly/test.pro

examples/DiscPatch/HydroStatic/README

examples/DiscPatch/HydroStatic/disc-patch-icc.yml

examples/DiscPatch/HydroStatic/disc-patch.yml

examples/DiscPatch/HydroStatic/dynamic.pro

examples/DiscPatch/HydroStatic/getGlass.sh

examples/DiscPatch/HydroStatic/makeIC.py

examples/DiscPatch/HydroStatic/test.pro

examples/EAGLE_25/README

examples/ExternalPointMass/externalPointMass.yml

examples/MultiTypes/multiTypes.yml

examples/SedovBlast_1D/sedov.yml

examples/UniformBox_3D/uniformBox.yml

examples/main.c