]> git.tuebingen.mpg.de Git - dss.git/commitdiff
projects / dss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a002cd5 f446dc1)
Merge commit 'remotes/meins/master'
authorAndre Noll <maan@congo.fml.local>
Thu, 20 Mar 2008 10:35:39 +0000 (11:35 +0100)
committerAndre Noll <maan@congo.fml.local>
Thu, 20 Mar 2008 10:35:39 +0000 (11:35 +0100)
Conflicts:

dss.ggo

1  2 
dss.ggo patch | diff1 | diff2 | blob | history

diff --cc dss.ggo
Simple merge
DSS - dyadic snapshot scheduler