Merge branch 'refs/heads/t/min-complete'

author Andre Noll <maan@tuebingen.mpg.de>

Fri, 12 Dec 2014 13:21:53 +0000 (14:21 +0100)

committer Andre Noll <maan@tuebingen.mpg.de>

Fri, 12 Dec 2014 13:21:53 +0000 (14:21 +0100)
author Andre Noll <maan@tuebingen.mpg.de>
Fri, 12 Dec 2014 13:21:53 +0000 (14:21 +0100)
committer Andre Noll <maan@tuebingen.mpg.de>
Fri, 12 Dec 2014 13:21:53 +0000 (14:21 +0100)
diff --cc dss.c
Simple merge
diff --cc dss.ggo
Simple merge
diff --cc snap.c
Simple merge
diff --cc snap.h
Simple merge
author	Andre Noll <maan@tuebingen.mpg.de>
	Fri, 12 Dec 2014 13:21:53 +0000 (14:21 +0100)
committer	Andre Noll <maan@tuebingen.mpg.de>
	Fri, 12 Dec 2014 13:21:53 +0000 (14:21 +0100)
		1	2
dss.c	patch \|	diff1 \|	diff2 \|	blob \| history
dss.ggo	patch \|	diff1 \|	diff2 \|	blob \| history
snap.c	patch \|	diff1 \|	diff2 \|	blob \| history
snap.h	patch \|	diff1 \|	diff2 \|	blob \| history