Merge branch 'master' of gitlab.ethz.ch:thealternative/courses

merge

Merge branch 'master' of gitlab.ethz.ch:thealternative/courses
merge
86618960 · Alexander Schoch · 08978d52 · 97609190 · 86618960 · 08978d52
Commit 86618960 authored Oct 25, 2019 by Alexander Schoch
113 changed files
--- a/.gitattributes
+++ b/.gitattributes
+*.tar.gz filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.svg filter=lfs diff=lfs merge=lfs -text
+*.xcf filter=lfs diff=lfs merge=lfs -text
+*.bbl filter=lfs diff=lfs merge=lfs -text
--- a/FOSS_course/img/BendixG15-2015.jpg
+++ b/FOSS_course/img/BendixG15-2015.jpg
--- a/FOSS_course/img/app.png
+++ b/FOSS_course/img/app.png
--- a/FOSS_course/img/canonical.png
+++ b/FOSS_course/img/canonical.png
--- a/FOSS_course/img/chrome.png
+++ b/FOSS_course/img/chrome.png
--- a/FOSS_course/img/chromium.png
+++ b/FOSS_course/img/chromium.png
--- a/FOSS_course/img/cl.png
+++ b/FOSS_course/img/cl.png
--- a/FOSS_course/img/contrib.png
+++ b/FOSS_course/img/contrib.png
--- a/FOSS_course/img/docker.png
+++ b/FOSS_course/img/docker.png
--- a/FOSS_course/img/drive.png
+++ b/FOSS_course/img/drive.png
--- a/FOSS_course/img/dropbox.png
+++ b/FOSS_course/img/dropbox.png
--- a/FOSS_course/img/fsf.png
+++ b/FOSS_course/img/fsf.png
--- a/FOSS_course/img/gp.png
+++ b/FOSS_course/img/gp.png
--- a/FOSS_course/img/icloud.png
+++ b/FOSS_course/img/icloud.png
--- a/FOSS_course/img/osi.png
+++ b/FOSS_course/img/osi.png
--- a/FOSS_course/img/play.png
+++ b/FOSS_course/img/play.png
--- a/FOSS_course/img/rh.png
+++ b/FOSS_course/img/rh.png
--- a/FOSS_course/img/tor.png
+++ b/FOSS_course/img/tor.png
--- a/FOSS_course/img/tux.png
+++ b/FOSS_course/img/tux.png
--- a/FOSS_course/slides.pdf
+++ b/FOSS_course/slides.pdf
--- a/LICENSE.md
+++ b/LICENSE.md
--- a/bash_course/guide.pdf
+++ b/bash_course/guide.pdf
--- a/bash_course/pres.pdf
+++ b/bash_course/pres.pdf
--- a/console_toolkit/console_toolkit_1.pdf
+++ b/console_toolkit/console_toolkit_1.pdf
--- a/console_toolkit/exercise_files/exercises.pdf
+++ b/console_toolkit/exercise_files/exercises.pdf
--- a/console_toolkit/exercise_files/pictures/.secret_dir/cat_hidden.jpg
+++ b/console_toolkit/exercise_files/pictures/.secret_dir/cat_hidden.jpg
--- a/console_toolkit/exercise_files/pictures/cat1.jpg
+++ b/console_toolkit/exercise_files/pictures/cat1.jpg
--- a/console_toolkit/exercise_files/pictures/cat2.jpg
+++ b/console_toolkit/exercise_files/pictures/cat2.jpg
--- a/console_toolkit/exercise_files/pictures/cat3.jpg
+++ b/console_toolkit/exercise_files/pictures/cat3.jpg
--- a/console_toolkit/exercise_files/pictures/dog1.jpg
+++ b/console_toolkit/exercise_files/pictures/dog1.jpg
--- a/hacking_session/exercises.pdf
+++ b/hacking_session/exercises.pdf
--- a/hacking_session/solutions.pdf
+++ b/hacking_session/solutions.pdf
--- a/install_event/helpers_cheat_sheet.pdf
+++ b/install_event/helpers_cheat_sheet.pdf
--- a/install_event/insatall_guide_assembled/Mac/fedora/IG_mac_fedora.pdf
+++ b/install_event/insatall_guide_assembled/Mac/fedora/IG_mac_fedora.pdf
--- a/install_event/insatall_guide_assembled/Mac/opensuse/IG_mac_opensuse.pdf
+++ b/install_event/insatall_guide_assembled/Mac/opensuse/IG_mac_opensuse.pdf
--- a/install_event/insatall_guide_assembled/Mac/ubuntu/IG_mac_ubuntu.pdf
+++ b/install_event/insatall_guide_assembled/Mac/ubuntu/IG_mac_ubuntu.pdf
--- a/install_event/insatall_guide_assembled/Mac/xubuntu/IG_mac_xubuntu.pdf
+++ b/install_event/insatall_guide_assembled/Mac/xubuntu/IG_mac_xubuntu.pdf
--- a/install_event/insatall_guide_assembled/Win7/fedora/IG_win7_fedora.pdf
+++ b/install_event/insatall_guide_assembled/Win7/fedora/IG_win7_fedora.pdf
--- a/install_event/insatall_guide_assembled/Win7/opensuse/IG_win7_opensuse.pdf
+++ b/install_event/insatall_guide_assembled/Win7/opensuse/IG_win7_opensuse.pdf
--- a/install_event/insatall_guide_assembled/Win7/ubuntu/IG_win7_ubuntu.pdf
+++ b/install_event/insatall_guide_assembled/Win7/ubuntu/IG_win7_ubuntu.pdf
--- a/install_event/insatall_guide_assembled/Win7/xubuntu/IG_win7_xubuntu.pdf
+++ b/install_event/insatall_guide_assembled/Win7/xubuntu/IG_win7_xubuntu.pdf
--- a/install_event/insatall_guide_assembled/Win8-10/fedora/IG_win8-10_fedora.pdf
+++ b/install_event/insatall_guide_assembled/Win8-10/fedora/IG_win8-10_fedora.pdf
--- a/install_event/insatall_guide_assembled/Win8-10/opensuse/IG_win8-10_opensuse.pdf
+++ b/install_event/insatall_guide_assembled/Win8-10/opensuse/IG_win8-10_opensuse.pdf
--- a/install_event/insatall_guide_assembled/Win8-10/ubuntu/IG_win8-10_ubuntu.pdf
+++ b/install_event/insatall_guide_assembled/Win8-10/ubuntu/IG_win8-10_ubuntu.pdf
--- a/install_event/insatall_guide_assembled/Win8-10/xubuntu/IG_win8-10_xubuntu.pdf
+++ b/install_event/insatall_guide_assembled/Win8-10/xubuntu/IG_win8-10_xubuntu.pdf
--- a/install_event/installguide_complete.pdf
+++ b/install_event/installguide_complete.pdf
--- a/intro_course/16HS_8_software.pdf
+++ b/intro_course/16HS_8_software.pdf
--- a/intro_course/img/Jigsaw_Puzzle.svg
+++ b/intro_course/img/Jigsaw_Puzzle.svg
--- a/intro_course/img/Linux_Distribution_Timeline.svg
+++ b/intro_course/img/Linux_Distribution_Timeline.svg
--- a/intro_course/img/SUSE-community-photo.jpg
+++ b/intro_course/img/SUSE-community-photo.jpg
--- a/intro_course/img/VLCdeps.png
+++ b/intro_course/img/VLCdeps.png
--- a/intro_course/img/VLCdeps.svg
+++ b/intro_course/img/VLCdeps.svg
--- a/intro_course/img/Xfce_logo.pdf
+++ b/intro_course/img/Xfce_logo.pdf
--- a/intro_course/img/Xfce_logo.svg
+++ b/intro_course/img/Xfce_logo.svg
--- a/intro_course/img/arch_logo.png
+++ b/intro_course/img/arch_logo.png
--- a/intro_course/img/archforum.png
+++ b/intro_course/img/archforum.png
--- a/intro_course/img/cardreader.jpg
+++ b/intro_course/img/cardreader.jpg
--- a/intro_course/img/choose-all-the-things.jpg
+++ b/intro_course/img/choose-all-the-things.jpg
--- a/intro_course/img/choose-all-the-things.pdf
+++ b/intro_course/img/choose-all-the-things.pdf
--- a/intro_course/img/choose-all-the-things.svg
+++ b/intro_course/img/choose-all-the-things.svg
--- a/intro_course/img/cnf.png
+++ b/intro_course/img/cnf.png
--- a/intro_course/img/desktop-computer.jpg
+++ b/intro_course/img/desktop-computer.jpg
--- a/intro_course/img/distro-timeline.jpg
+++ b/intro_course/img/distro-timeline.jpg
--- a/intro_course/img/fedora_logo.png
+++ b/intro_course/img/fedora_logo.png
--- a/intro_course/img/gnome.pdf
+++ b/intro_course/img/gnome.pdf
--- a/intro_course/img/gnome.png
+++ b/intro_course/img/gnome.png
--- a/intro_course/img/gnome.svg
+++ b/intro_course/img/gnome.svg
--- a/intro_course/img/gnome3.png
+++ b/intro_course/img/gnome3.png
--- a/intro_course/img/internet.jpg
+++ b/intro_course/img/internet.jpg
--- a/intro_course/img/kde.png
+++ b/intro_course/img/kde.png
--- a/intro_course/img/linux_kernel.pdf
+++ b/intro_course/img/linux_kernel.pdf
--- a/intro_course/img/linux_kernel.svg
+++ b/intro_course/img/linux_kernel.svg
--- a/intro_course/img/linux_kernel_blank.pdf
+++ b/intro_course/img/linux_kernel_blank.pdf
--- a/intro_course/img/logo_blue.pdf
+++ b/intro_course/img/logo_blue.pdf
--- a/intro_course/img/logo_white.pdf
+++ b/intro_course/img/logo_white.pdf
--- a/intro_course/img/logos.png
+++ b/intro_course/img/logos.png
--- a/intro_course/img/logos.xcf
+++ b/intro_course/img/logos.xcf
--- a/intro_course/img/multiboot.jpg
+++ b/intro_course/img/multiboot.jpg
--- a/intro_course/img/my_system.pdf
+++ b/intro_course/img/my_system.pdf
--- a/intro_course/img/my_system.png
+++ b/intro_course/img/my_system.png
--- a/intro_course/img/my_system.svg
+++ b/intro_course/img/my_system.svg
--- a/intro_course/img/my_system_arch.pdf
+++ b/intro_course/img/my_system_arch.pdf
--- a/intro_course/img/my_system_arch.png
+++ b/intro_course/img/my_system_arch.png
--- a/intro_course/img/my_system_arch.svg
+++ b/intro_course/img/my_system_arch.svg
--- a/intro_course/img/network-troubleshooter-windows10.jpg
+++ b/intro_course/img/network-troubleshooter-windows10.jpg
--- a/intro_course/img/opensuse_logo.png
+++ b/intro_course/img/opensuse_logo.png
--- a/intro_course/img/package-manager-blank.pdf
+++ b/intro_course/img/package-manager-blank.pdf
--- a/intro_course/img/package-manager-refresh.pdf
+++ b/intro_course/img/package-manager-refresh.pdf
--- a/intro_course/img/package-manager-upgrade.pdf
+++ b/intro_course/img/package-manager-upgrade.pdf
--- a/intro_course/img/package-manager.svg
+++ b/intro_course/img/package-manager.svg
--- a/intro_course/img/pacvis.png
+++ b/intro_course/img/pacvis.png
--- a/intro_course/img/pc-components.jpg
+++ b/intro_course/img/pc-components.jpg
--- a/intro_course/img/puzzlepiece.pdf
+++ b/intro_course/img/puzzlepiece.pdf
--- a/intro_course/img/ticketautomat.jpg
+++ b/intro_course/img/ticketautomat.jpg
--- a/intro_course/img/tux-break-os.jpg
+++ b/intro_course/img/tux-break-os.jpg
--- a/intro_course/img/ubuntu_logo.png
+++ b/intro_course/img/ubuntu_logo.png
--- a/intro_course/img/ubuntu_system.pdf
+++ b/intro_course/img/ubuntu_system.pdf
--- a/intro_course/img/ubuntu_system.png
+++ b/intro_course/img/ubuntu_system.png
--- a/intro_course/img/ubuntu_system.svg
+++ b/intro_course/img/ubuntu_system.svg
--- a/intro_course/img/ubuntu_system_orange.pdf
+++ b/intro_course/img/ubuntu_system_orange.pdf
--- a/intro_course/img/ubuntu_system_orange.png
+++ b/intro_course/img/ubuntu_system_orange.png
--- a/intro_course/img/ubuntu_system_orange.svg
+++ b/intro_course/img/ubuntu_system_orange.svg
--- a/intro_course/img/vlc.pdf
+++ b/intro_course/img/vlc.pdf
--- a/intro_course/img/vlc.svg
+++ b/intro_course/img/vlc.svg
--- a/intro_course/img/vlcdeps.pdf
+++ b/intro_course/img/vlcdeps.pdf
--- a/intro_course/img/vlcdeps.svg
+++ b/intro_course/img/vlcdeps.svg
--- a/intro_course/img/windows-network-troubleshooting.png
+++ b/intro_course/img/windows-network-troubleshooting.png
--- a/intro_course/img/windowsupdate.png
+++ b/intro_course/img/windowsupdate.png
--- a/intro_course/img/wmp.jpg
+++ b/intro_course/img/wmp.jpg
--- a/intro_course/img/xfce-rice1.png
+++ b/intro_course/img/xfce-rice1.png
--- a/intro_course/img/xfce-rice2.png
+++ b/intro_course/img/xfce-rice2.png
--- a/intro_course/img/xfce.png
+++ b/intro_course/img/xfce.png
--- a/intro_course/slides.pdf
+++ b/intro_course/slides.pdf