Skip to content
Snippets Groups Projects
Commit 689d0ba5 authored by Christoph Groth's avatar Christoph Groth
Browse files

Merge branch 'hoppingkind' into devel

Conflicts:
	doc/source/whatsnew/0.3.rst
	kwant/lattice.py
parents f131a7de 4a48b23d
No related branches found
No related tags found
No related merge requests found
Showing
with 246 additions and 208 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 to comment