diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-06 08:29:20 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-06 08:29:20 +0100 |
| commit | 1d5cf0f448b08d398f7edee472815844926e5de4 (patch) | |
| tree | e6af9a153673b827d3b22d3b64c8917b0b4103a7 /preamble | |
| parent | 2784a5345920940253a0501041a0b101df952a0b (diff) | |
| parent | a52f1ab9f85cf9583c0608708093db6d004ffee4 (diff) | |
Merge branch 'sep-8-2014', September 8, 2014 board meeting minutes
Conflicts appeard for '2014/Makefile' and
'preamble/preamble.tex'. Those were solved.
Diffstat (limited to 'preamble')
| -rw-r--r-- | preamble/preamble.tex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/preamble/preamble.tex b/preamble/preamble.tex index 6331238..7001a21 100644 --- a/preamble/preamble.tex +++ b/preamble/preamble.tex @@ -71,7 +71,6 @@ \newcommand \giraff {\texthost{giraff}} \newcommand \gnuhost {\texthost{gnu}} \newcommand \gnu {\textsc{gnu}} -\newcommand \gnuhost {\texthost{gnu}} \newcommand \gnupg {Gnu\textsc{pg}} \newcommand \gpg {\textsc{gpg}} \newcommand \gpgg {\gpg\ (\gnu\ Privacy Guard)} @@ -107,9 +106,11 @@ \newcommand \prqq {PeriQ Networks (\textsc{prq})} \newcommand \raid {\textsc{raid}} \newcommand \rfc {\textsc{rfc}} +\newcommand \savanah {\texthost{savanah}} \newcommand \serengeti {\texthost{serengeti}} \newcommand \sgs {\textsc{sgs}} \newcommand \sgslong {\textsc{sgs} (Stiftelsen Göteborgs studentbostäder)} +\newcommand \sms {\textsc{sms}} \newcommand \smtp {\textsc{smtp}} \newcommand \ssh {\textsc{ssh}} \newcommand \sso {\textsc{sso}} |