# HG changeset patch
# User Christian Urban <urbanc@in.tum.de>
# Date 1316593821 -7200
# Node ID 9133086a08173100bb80e9e55e1ab8645df0f78b
# Parent  833d65c6ad88c1600f6c86e3f7d947d9bdf52270# Parent  c46def7dc4a79d42f33fcd8df83630cc273d46ed
merged

diff -r 833d65c6ad88 -r 9133086a0817 LMCS-Paper/document/root.tex
--- a/LMCS-Paper/document/root.tex	Wed Sep 21 10:30:10 2011 +0200
+++ b/LMCS-Paper/document/root.tex	Wed Sep 21 10:30:21 2011 +0200
@@ -7,13 +7,13 @@
 %%\usepackage{amsthm}
 \usepackage{tikz}
 \usepackage{pgf}
-\usepackage{pdfsetup}
 \usepackage{ot1patch}
 \usepackage{times}
 \usepackage{boxedminipage}
 \usepackage{proof}
 \usepackage{setspace}
 \usepackage{afterpage}
+\usepackage{pdfsetup}
 
 \allowdisplaybreaks
 \urlstyle{rm}