modified:   tasks/demos/basic-anisotropy/anisotropic-strike-11-layers.xml
	new file:   tasks/demos/basic-anisotropy/anisotropic-strike-11-layers.xml~
	modified:   tasks/demos/basic-anisotropy/anisotropic-strike.xml
Merge remote-tracking branch 'upstream/master'
	new file:   src/libgcm/rheology/decomposers/AnalyticalRheologyMatrixDecomposer.cpp
	modified:   src/libgcm/rheology/decomposers/AnalyticalRheologyMatrixDecomposer.hpp
	modified:   src/libgcm/rheology/decomposers/NumericalRheologyMatrixDecomposer.cpp
	modified:   src/libgcm/rheology/setters/PrandtlRaussPlasticityRheologyMatrixSetter.cpp
	modified:   src/libgcm/util/ThirdDegreePolynomial.cpp
	modified:   src/libgcm/util/ThirdDegreePolynomial.hpp
	modified:   src/launcher/launcher.cpp
	new file:   src/launcher/launcher.cpp.orig
	new file:   src/launcher/launcher.cpp.rej
	modified:   src/libgcm/rheology/decomposers/AnalyticalRheologyMatrixDecomposer.cpp
	modified:   src/libgcm/util/ThirdDegreePolynomial.cpp
	modified:   src/tests/unit/anisotropic_matrixes.cpp
	modified:   src/libgcm/rheology/decomposers/AnalyticalRheologyMatrixDecomposer.cpp
	modified:   src/tests/unit/anisotropic_matrixes.cpp
	modified:   src/launcher/launcher.cpp
	deleted:    src/launcher/launcher.cpp.orig
	deleted:    src/launcher/launcher.cpp.rej
	modified:   src/libgcm/rheology/setters/PrandtlRaussPlasticityRheologyMatrixSetter.cpp
	modified:   src/libgcm/util/ThirdDegreePolynomial.cpp
	modified:   tasks/demos/basic-anisotropy/anisotropic-strike-two-layers.xml
	modified:   tasks/tests/p-wave-plastic-test.xml
- Cleanup after merging pull request #38
- Rename task file tag <anisotropicMatrix/> into <matrixDecomposition/> since it is really about generic matrix decomposition now
Merge remote-tracking branch 'origin/master'

Conflicts:
	tasks/demos/basic-anisotropy/anisotropic-strike-11-layers.xml