Skip to content
Snippets Groups Projects
Commit 3eb79926 authored by Steffen Müthing's avatar Steffen Müthing
Browse files

Merge remote-tracking branch 'upstream/master'

Stay up to date...

* upstream/master:
  Check for std::conditional and pull it into the Dune namespace
  Properly implement check in method 'touch'
  spelling
  Use variadic templates for PushBackTuple and PushFrontTuple, if available

Conflicts:
	m4/CMakeLists.txt
	m4/Makefile.am
	m4/dune_common.m4
parents d1ce85a4 da269488
No related branches found
No related tags found
No related merge requests found
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 to comment