dune.module · 5499fedced1807f723566c77135579cbd56131bc · ag-ohlberger / dune-community / dune-xt

9 years ago

Merge branch 'master' of https://github.com/wwu-numerik/dune-stuff into dune-testtools · 10ecf582

Tobias Leibner authored 9 years ago

Conflicts:
	.travis.yml
	dune/stuff/test/grid_provider_cube.cc
	dune/stuff/test/grid_provider_dgf.cc
	dune/stuff/test/grid_provider_gmsh.cc

Resolved grid_provider files to local (deleted).
Resolved travis.yml to local except that it includes the new licence header now.

10ecf582

History

Merge branch 'master' of https://github.com/wwu-numerik/dune-stuff into dune-testtools

Tobias Leibner authored 9 years ago

Conflicts:
	.travis.yml
	dune/stuff/test/grid_provider_cube.cc
	dune/stuff/test/grid_provider_dgf.cc
	dune/stuff/test/grid_provider_gmsh.cc

Resolved grid_provider files to local (deleted).
Resolved travis.yml to local except that it includes the new licence header now.

Code owners

Assign users and groups as approvers for specific file changes. Learn more.