Merge branch 'master' of lsmssrv1.epfl.ch:akantu
7f9872a216df
Actions

Authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> on Nov 18 2015, 21:01.

Description

Merge branch 'master' of lsmssrv1.epfl.ch:akantu

Committed

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>

Nov 18 2015, 21:01

Pushed

Parents

Branches

Unknown

Tags

Unknown

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> committed rAKA7f9872a216df: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>).Nov 18 2015, 21:01

Commit	Author	Details	Committed
983f668d7076	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
0d9183b269ba	Clement Roux	proper computation of external work in statics	Nov 18 2015
b894062ef5c3	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
1aa749cbda83	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
4af6b43d250f	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
3fba4c153a26	Clement Roux	remove unused event in material	Nov 18 2015

				Path
	M			src/fe_engine/fe_engine_template_tmpl.hh
	M			src/model/solid_mechanics/material.hh
	M			src/model/solid_mechanics/materials/material_non_local_includes.hh
	M			src/model/solid_mechanics/solid_mechanics_model.cc
	M			src/model/solid_mechanics/solid_mechanics_model_inline_impl.cc