Merge https://github.com/DigNative/Applied-Crypto-Hardening
authorAaron Zauner <azet@azet.org>
Sat, 1 Nov 2014 23:59:51 +0000 (00:59 +0100)
committerAaron Zauner <azet@azet.org>
Sat, 1 Nov 2014 23:59:51 +0000 (00:59 +0100)
presentations/HACK.LU-2014/presentation_hacklu_2014.pptx
src/acknowledgements.tex
src/common/configfiles.tex

index beb53d4..007a1c1 100755 (executable)
Binary files a/presentations/HACK.LU-2014/presentation_hacklu_2014.pptx and b/presentations/HACK.LU-2014/presentation_hacklu_2014.pptx differ
index c06e7ed..0f095ee 100644 (file)
@@ -28,6 +28,7 @@ Pichler, Patrick \\
 Riebesel, Nicolas \\
 Roeckx, Kurt \\
 Rublik, Martin \\
+Schwarz, René («DigNative») \\
 Seidl, Eva (PDF layout) \\
 Wagner, Sebastian («sebix») \\
 Zangerl, Alexander \\
index ff29f8c..d3d9a4e 100644 (file)
@@ -10,6 +10,7 @@
 %%    I need dis
 %%%
 \RequirePackage{etoolbox}
+\RequirePackage{ifplatform}
 
 % for convenienc
 \newwrite\configfileout
@@ -57,6 +58,7 @@
     \edef\configfilename{\expandafter\detokenize\expandafter{\configfilen@me}}
     \def\configfilepres{\expandafter\protect\expandafter\path\expandafter{\configfilename}}
     \immediate\write\configfileout{\configfilename}
+    \ifwindows\def\dummy@ext{.}\else\let\dummy@ext\empty\fi%
     \lstinputlisting[%
       linerange={#3},%
       %autounindent,%
@@ -65,7 +67,7 @@
           #4\\\mbox{\protect\href{\@configurationbaseurl\configfilename}{%
               {\upshape [\configfilepres]}%
         }}}
-      #1]{\configfilename}%
+      #1]{\configfilename\dummy@ext}%
     \marginpar{\vspace*{-2\baselineskip}\protect\href{\@configurationbaseurl\configfilename}{%
         \includegraphics[height=2\baselineskip]{img/ConfigIcns}}}
   \else%