git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8e47d1e
f0a4bb5
)
Merge branch 'master' into scheduler
author
Jordan Augé
<jordan.auge@lip6.fr>
Wed, 27 Nov 2013 08:32:58 +0000
(09:32 +0100)
committer
Jordan Augé
<jordan.auge@lip6.fr>
Wed, 27 Nov 2013 08:32:58 +0000
(09:32 +0100)
1
2
portal/sliceview.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
portal/sliceview.py
Simple merge