merging upstream changes

author Michal KOZIEL <koziel@physik.uni-frankfurt.de>

Thu, 5 Feb 2015 09:53:51 +0000 (10:53 +0100)

committer Michal KOZIEL <koziel@physik.uni-frankfurt.de>

Thu, 5 Feb 2015 09:53:51 +0000 (10:53 +0100)
author Michal KOZIEL <koziel@physik.uni-frankfurt.de>
Thu, 5 Feb 2015 09:53:51 +0000 (10:53 +0100)
committer Michal KOZIEL <koziel@physik.uni-frankfurt.de>
Thu, 5 Feb 2015 09:53:51 +0000 (10:53 +0100)
diff --cc GSI_2015_MK_TT_PRESTO/MVD_Presto.pdf

index 0000000000000000000000000000000000000000,9178b9168307cfafbf847e5107ee374e89fde898..3974b46862b3215bba4e28c0d8fe66fd7aba86d3

mode 000000,100644..100644

Binary files differ
diff --cc GSI_2015_MK_TT_PRESTO/MVD_Presto.tex
Simple merge
diff --cc GSI_2015_MK_TT_PRESTO/PRESTO_sketch.png

index 674d729c24ed9a27f2b2030a86a1cbb4bd2bdcdc,674d729c24ed9a27f2b2030a86a1cbb4bd2bdcdc..0000000000000000000000000000000000000000

deleted file mode 100644,100644

Binary files differ
author	Michal KOZIEL <koziel@physik.uni-frankfurt.de>
	Thu, 5 Feb 2015 09:53:51 +0000 (10:53 +0100)
committer	Michal KOZIEL <koziel@physik.uni-frankfurt.de>
	Thu, 5 Feb 2015 09:53:51 +0000 (10:53 +0100)
		1	2
GSI_2015_MK_TT_PRESTO/MVD_Presto.pdf	patch \|	\|	diff2 \|	blob \| history
GSI_2015_MK_TT_PRESTO/MVD_Presto.tex	patch \|	diff1 \|	diff2 \|	blob \| history
GSI_2015_MK_TT_PRESTO/PRESTO_sketch.png	patch \|	blob1 \|	blob2 \|	history