aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorGustav Eek <gustav@fripost.org>2015-03-02 20:17:45 +0100
committerGustav Eek <gustav@fripost.org>2015-03-02 20:17:45 +0100
commitfe12842374a257c03c7210ae9fddfdafe5cb79d7 (patch)
tree5c9062e62c8cec3b4052fc5544d8d3af975fbe74 /resources
parent6fab3cb421b68d419193490a6bcc122290866013 (diff)
parent22eec5d6ac3b064d43f7ffba05eb0b5819532a4f (diff)
Merge branch 'annual-mar-29', minutes from annual meeting 2014
Conflicting '2014/Makefile' was resolved
Diffstat (limited to 'resources')
-rw-r--r--resources/board-minutes-template-en.tex29
-rw-r--r--resources/board-minutes-template-sv.tex30
-rw-r--r--resources/participants28
3 files changed, 38 insertions, 49 deletions
diff --git a/resources/board-minutes-template-en.tex b/resources/board-minutes-template-en.tex
index 564f47f..f195e15 100644
--- a/resources/board-minutes-template-en.tex
+++ b/resources/board-minutes-template-en.tex
@@ -27,31 +27,12 @@
}%
\parbox[t]{\tempTwo}{\mbox{}\vspace{-2\baselineskip}\vspace{2pt}%
\begin{multicols}{3}%
-% Navid Abdi\\
-% Fredrik Ahlsgren\\
-% Daniel Andersson \\
-% Marco Baxmyr \\
-% Andréa Bruzelius \\
-% Rikard Bruzelius \\
% Gustav Eek\\
-% Daniel Eriksson \\
-% Mattias Ivarsson \\
-% Stefan Kangas \\
-% Jens Lideström \\
-% Guilhem Moulin \\
-% Lola Möller \\
-% Leif-Jöran Olsson \\
-% Taraka Rama \\
-% Dan Ros\'en\\
-% Stian Rødven Eide \\
-% Andreas Skyman \\
-% Delphine Szymczak \\
-% Johan Söderberg
-% Ver Takeo \\
-% Eva Werner
-% Gregoar \\
-% Anders \\
-% Anders (alias\ Hypermakt)
+% Guilhem Moulin\\
+% Lola Möller\\
+% Leif-Jöran Olsson\\
+% Stian Rødven Eide\\
+% Delphine Szymczak
\end{multicols}%
}
\newcommand \meetingchairman {Stian Rødven Eide}
diff --git a/resources/board-minutes-template-sv.tex b/resources/board-minutes-template-sv.tex
index 2656c19..1719fe6 100644
--- a/resources/board-minutes-template-sv.tex
+++ b/resources/board-minutes-template-sv.tex
@@ -27,32 +27,12 @@
}%
\parbox[t]{\tempTwo}{\mbox{}\vspace{-2\baselineskip}\vspace{2pt}%
\begin{multicols}{3}%
-% Navid Abdi\\
-% Fredrik Ahlsgren\\
-% Daniel Andersson \\
-% Mikael Andersson
-% Marco Baxmyr \\
-% Andréa Bruzelius \\
-% Rikard Bruzelius \\
% Gustav Eek\\
-% Daniel Eriksson \\
-% Mattias Ivarsson \\
-% Stefan Kangas \\
-% Jens Lideström \\
-% Guilhem Moulin \\
-% Lola Möller \\
-% Leif-Jöran Olsson \\
-% Taraka Rama \\
-% Dan Ros\'en\\
-% Stian Rødven Eide \\
-% Andreas Skyman \\
-% Delphine Szymczak \\
-% Johan Söderberg
-% Ver Takeo \\
-% Eva Werner
-% Gregoar \\
-% Anders \\
-% Anders (alias\ Hypermakt)
+% Guilhem Moulin\\
+% Lola Möller\\
+% Leif-Jöran Olsson\\
+% Stian Rødven Eide\\
+% Delphine Szymczak
\end{multicols}%
}
\newcommand \meetingchairman {Stian Rødven Eide}
diff --git a/resources/participants b/resources/participants
new file mode 100644
index 0000000..468c9eb
--- /dev/null
+++ b/resources/participants
@@ -0,0 +1,28 @@
+Navid Abdi
+Fredrik Ahlsgren
+Daniel Andersson
+Mikael Andersson
+Marco Baxmyr
+Andréa Bruzelius
+Rikard Bruzelius
+Grégoire Détrez
+Gustav Eek
+Daniel Eriksson
+Dagfinn L. Hotvedt
+Mattias Ivarsson
+Stefan Kangas
+Jens Lideström
+Guilhem Moulin
+Lola Möller
+Leif-Jöran Olsson
+Taraka Rama
+Dan Ros\'en
+Stian Rødven Eide
+Albin S.
+Andreas Skyman
+Delphine Szymczak
+Johan Söderberg
+Ver Takeo
+Eva Werner
+Anders
+Anders (alias\ Hypermakt)