Skip to content
Snippets Groups Projects
  1. Nov 02, 2018
    • Tobias Leibner's avatar
      [gitignore] ignore pycache · 4cfa6c54
      Tobias Leibner authored
      4cfa6c54
    • Tobias Leibner's avatar
      Merge branch 'master' of github.com:dune-community/dune-xt-functions into new-master · 04950fcf
      Tobias Leibner authored
      Resolved CI files to master, all other files to new-master
      
      Conflicts:
      	.gitsuper
      	.travis.test_python.bash
      	.travis.yml
      	dune/xt/functions/interfaces/local-functions.hh
      	dune/xt/functions/spe10/model1.hh
      	dune/xt/functions/spe10/model2.hh
      	dune/xt/functions/test/CMakeLists.txt
      	dune/xt/functions/test/affine.cc
      	dune/xt/functions/test/affine_flux.cc
      	dune/xt/functions/test/builder_definitions.cmake
      	dune/xt/functions/test/compiles_totals.pickle
      	dune/xt/functions/test/testruns_totals.pickle
      	python/dune/xt/bindings.cc
      04950fcf
  2. Nov 01, 2018
  3. Oct 29, 2018
  4. Oct 18, 2018
  5. Oct 15, 2018
  6. Oct 12, 2018
  7. Aug 31, 2018
  8. Aug 27, 2018
  9. Aug 16, 2018
  10. Aug 14, 2018
  11. Aug 05, 2018
  12. Jul 28, 2018
  13. Jul 25, 2018
  14. Jul 24, 2018
  15. Jul 23, 2018
  16. Jul 19, 2018
Loading