diff --git a/2011-28c3/pix/a_copyright.jpg b/2011-28c3/pix/a_copyright.jpg new file mode 100644 index 0000000..c09060c Binary files /dev/null and b/2011-28c3/pix/a_copyright.jpg differ diff --git a/2011-28c3/pix/a_edathy.jpg b/2011-28c3/pix/a_edathy.jpg new file mode 100644 index 0000000..5afc3e5 Binary files /dev/null and b/2011-28c3/pix/a_edathy.jpg differ diff --git a/2011-28c3/pix/a_fefe.jpg b/2011-28c3/pix/a_fefe.jpg new file mode 100644 index 0000000..a656152 Binary files /dev/null and b/2011-28c3/pix/a_fefe.jpg differ diff --git a/2011-28c3/pix/a_gpl.png b/2011-28c3/pix/a_gpl.png new file mode 100644 index 0000000..0bd3fbb Binary files /dev/null and b/2011-28c3/pix/a_gpl.png differ diff --git a/2011-28c3/pix/a_snowman.jpg b/2011-28c3/pix/a_snowman.jpg new file mode 100644 index 0000000..ab3b180 Binary files /dev/null and b/2011-28c3/pix/a_snowman.jpg differ diff --git a/2011-28c3/pix/orgchart-ms.png b/2011-28c3/pix/orgchart-ms.png index d946602..42e8559 100644 Binary files a/2011-28c3/pix/orgchart-ms.png and b/2011-28c3/pix/orgchart-ms.png differ diff --git a/2011-28c3/pix/q_copyright.jpg b/2011-28c3/pix/q_copyright.jpg new file mode 100644 index 0000000..a768c41 Binary files /dev/null and b/2011-28c3/pix/q_copyright.jpg differ diff --git a/2011-28c3/pix/q_edathy.jpg b/2011-28c3/pix/q_edathy.jpg new file mode 100644 index 0000000..0a6cbd6 Binary files /dev/null and b/2011-28c3/pix/q_edathy.jpg differ diff --git a/2011-28c3/pix/q_fefe.png b/2011-28c3/pix/q_fefe.png new file mode 100644 index 0000000..4caf341 Binary files /dev/null and b/2011-28c3/pix/q_fefe.png differ diff --git a/2011-28c3/pix/q_gpl.png b/2011-28c3/pix/q_gpl.png new file mode 100644 index 0000000..5cfedea Binary files /dev/null and b/2011-28c3/pix/q_gpl.png differ diff --git a/2011-28c3/pix/q_snowman.jpg b/2011-28c3/pix/q_snowman.jpg new file mode 100644 index 0000000..48936aa Binary files /dev/null and b/2011-28c3/pix/q_snowman.jpg differ diff --git a/2011-28c3/questions.yaml b/2011-28c3/questions.yaml index b938cbc..a1f0838 100644 --- a/2011-28c3/questions.yaml +++ b/2011-28c3/questions.yaml @@ -539,9 +539,9 @@ tier: 6 game_round: 3 media: question: - - pix/question1.png + - pix/q_edathy.jpg explanation: - - videos/question1.webm + - pix/a_edathy.jpg --- !Question question: What was not patented to our knowledge? @@ -555,12 +555,13 @@ tier: 7 game_round: 3 media: question: - - pix/question1.png + - pix/q_snowman.jpg explanation: - - videos/question1.webm + - pix/a_snowman.jpg --- !Question question: Which country did not get his copyright law dictated by the US? +comment: Einen der ersten XKCDs (Nr. 14) source: http://www.michaelgeist.ca/content/view/5765/125/ answers: - false: Canada @@ -571,9 +572,9 @@ tier: 8 game_round: 3 media: question: - - pix/question1.png + - pix/q_copyright.jpg explanation: - - videos/question1.webm + - pix/a_copyright.jpg --- !Question question: What vendor/project did not violate the GPL? @@ -587,9 +588,9 @@ tier: 10 game_round: 3 media: question: - - pix/question1.png + - pix/q_gpl.png explanation: - - videos/question1.webm + - pix/a_gpl.png --- !Question question: What company does this org chart show? source: http://www.bonkersworld.net/wp-content/uploads/2011/06/2011.06.27_organizational_charts.png @@ -618,9 +619,9 @@ tier: 2 game_round: 4 media: question: - - pix/question1.png + - pix/q_fefe.png explanation: - - videos/question1.webm + - pix/a_fefe.jpg --- !Question question: Who did not die this year?