From 284be583bd57f849bb2b9fbb2015a98148b1c11d Mon Sep 17 00:00:00 2001 From: Florian Kaiser Date: Tue, 22 Dec 2015 12:58:10 +0100 Subject: [PATCH 1/4] Fix broken link to r0cket wiki --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 412f097..e46d8cf 100644 --- a/README.md +++ b/README.md @@ -461,7 +461,7 @@ These people have contributed to improve this list for everyone (in no particula [1]:https://events.ccc.de/congress/2015/wiki/Static:How_To_Survive [2]:https://www.eventphone.de/ [3]:https://events.ccc.de/congress/2013/wiki/Static:Anti-Harassment_Policy "Anti Harrassment Policy" -[4]:http://r0cket.org/ +[4]:http://r0cket.de/ [5]:https://www.noisebridge.net/wiki/Passport [6]:https://en.wikipedia.org/wiki/Schuko [7]:https://itunes.apple.com/at/app/onion-browser/id519296448?l=en&mt=8 From 8392f494aefd6f904a3856c21a88fb7213fde37d Mon Sep 17 00:00:00 2001 From: Jonas Wisplinghoff Date: Tue, 22 Dec 2015 17:52:17 +0100 Subject: [PATCH 2/4] remove duplicates --- README.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/README.md b/README.md index 412f097..ac7f733 100644 --- a/README.md +++ b/README.md @@ -231,22 +231,7 @@ Also remember to pack some reserves of your medication. Better to have too much - Apple certified SIM eject tool™ (aka bent paperclip) to swap SIM cards - Smart Watches - Charging cable or docking station required to charge -- a portable battery pack (aka powerbank) so you can charge on the go. (And the necessary cable to recharge that battery pack overnight.) - WiFi router/firewall (to connect to the hotel Wifi/network) -- photo camera (but please remember to ask if it is ok to take a picture BEFORE taking the picture) - - batteries - - charger - - memory cards (CF, SD, SDHC, xD, memory stick, etc.) - - freshly formatted - - card reader to import pictures (if your laptop doesn't have a matching built-in card reader) - - camera bag - - camera strap - - lenses with lens caps - - lens cleaning cloth - - most Android phones - - USB-micro USB cable - - DECT phones - - Charging cradle (with power brick if required) - A portable battery pack (aka powerbank) so you can charge on the go. (And the necessary cable to recharge that battery pack overnight.) #### Wireless and HF @@ -282,7 +267,7 @@ Also remember to pack some reserves of your medication. Better to have too much - **Optional** 1-10Gigabit Ethernet Switch -#### Camera +#### Camera (but please remember to ask if it is ok to take a picture BEFORE taking the picture) - Photo camera / Actioncam - Batteries - Charger From f957232d77bf43301beebf9fa9f3880969b17457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Martin=20Kl=C3=BCnder?= Date: Wed, 23 Dec 2015 11:07:37 +0100 Subject: [PATCH 3/4] nail polish remover --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 412f097..386eac3 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ Chaos Communication Congress 2015 (2015-12-27 .. 2015-12-30) ### Cosmetics - Make up - Nail polish +- Nail polish remover - Nail scissors - Nail file - Razor (with spare blades / plus charger if it is an electrical one) From c215a0f11838eee3f2a93d11d82f13cc380c38bd Mon Sep 17 00:00:00 2001 From: rponline Date: Wed, 23 Dec 2015 22:37:05 +0100 Subject: [PATCH 4/4] add neck cushion --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 412f097..6534b6a 100644 --- a/README.md +++ b/README.md @@ -312,6 +312,7 @@ Also remember to pack some reserves of your medication. Better to have too much - LED throwies - Tesla coils - Headphones (so you don't have to talk to other carbon units while traveling) +- Neck cushion (for long journeys) - All your devices!!1 (Raspberry Pi, Arduino, FreedomBox, DreamPlug, …) - + cables + SD-cards (+ GPIO equipment) - + extra WiFi antenna (USB) and/or extra Ethernet cord