8 commits

Author	SHA1	Message	Date
Valentin Boettcher	ceaea5ba97	Merge branch 'master' of ssh://git.protagon.space:222/hiro98/FPraktikum	2019-11-16 11:53:09 +01:00
Valentin Boettcher	6c32c293c4	add measurements for sz	2019-11-16 11:52:12 +01:00
Oliver	f99f79874e	sz lab report intro v3	2019-11-15 18:35:23 +01:00
Oliver	2cb9713fff	sz lab report intro 2	2019-11-14 19:31:41 +01:00
Oliver	65f7657fb3	Erste kurze Einleitung	2019-11-13 23:58:01 +01:00
hiro98	7d8e072b97	test conflicts	2019-11-11 20:29:53 +01:00
Oliver	1b58c36f37	test	2019-11-11 17:47:28 +01:00
hiro98	94caa0a48c	skelleton for sz	2019-11-11 19:28:16 +01:00