Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dune-xt
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

f9c94edd

Commit f9c94edd authored 10 years ago by Tobias Leibner

Downloads
- Plain Diff

Merge branch 'master' into map_for_periodic_grid

Conflicts:
	dune/stuff/discretefunction/projection/heterogenous.hh
	dune/stuff/grid/periodicview.hh

parents 2bce0032 6bcd75b1

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

dune/stuff/functions/interfaces.hh 1 addition, 1 deletion

dune/stuff/functions/interfaces.hh
dune/stuff/test/functions_combined.cc 4 additions, 5 deletions

dune/stuff/test/functions_combined.cc
dune/stuff/test/functions_flattop.cc 6 additions, 7 deletions

dune/stuff/test/functions_flattop.cc

with 11 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment