From b8c40b904e691aee4a6b022bf61c2a6b99f4b0d0 Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Thu, 21 Mar 2013 17:13:01 +0100
Subject: [PATCH] * merged README files

---
 README    | 37 -------------------------------------
 README.md | 40 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 40 deletions(-)
 delete mode 100644 README

diff --git a/README b/README
deleted file mode 100644
index 73db26cb6b..0000000000
--- a/README
+++ /dev/null
@@ -1,37 +0,0 @@
-License
-=======
-* All sources and binaries that have been developed at Freie Universität Berlin are
-  licensed under the GNU General Public License version 3 as published by the
-  Free Software Foundation.
-* Some external sources, especially files developed by SICS are published under
-  a separate license.
-  
-All code files contain licensing information.
-
-
-                          ZZZZZZ                                                
-                        ZZZZZZZZZZZZ                                             
-                      ZZZZZZZZZZZZZZZZ                                           
-                     ZZZZZZZ     ZZZZZZ                                          
-                    ZZZZZZ        ZZZZZ                                          
-                    ZZZZZ          ZZZZ                                          
-                    ZZZZ           ZZZZZ                                         
-                    ZZZZ           ZZZZ                                          
-                    ZZZZ          ZZZZZ                                          
-                    ZZZZ        ZZZZZZ                                           
-                    ZZZZ     ZZZZZZZZ       777        7777       7777777777     
-              ZZ    ZZZZ   ZZZZZZZZ         777      77777777    77777777777     
-          ZZZZZZZ   ZZZZ  ZZZZZZZ           777     7777  7777       777         
-        ZZZZZZZZZ   ZZZZ    Z               777     777    777       777         
-       ZZZZZZ       ZZZZ                    777     777    777       777         
-      ZZZZZ         ZZZZ                    777     777    777       777         
-     ZZZZZ          ZZZZZ    ZZZZ           777     777    777       777         
-     ZZZZ           ZZZZZ    ZZZZZ          777     777    777       777         
-     ZZZZ           ZZZZZ     ZZZZZ         777     777    777       777         
-     ZZZZ           ZZZZ       ZZZZZ        777     777    777       777         
-     ZZZZZ         ZZZZZ        ZZZZZ       777     777    777       777         
-      ZZZZZZ     ZZZZZZ          ZZZZZ      777     7777777777       777         
-       ZZZZZZZZZZZZZZZ            ZZZZ      777      77777777        777         
-         ZZZZZZZZZZZ               Z                                             
-            ZZZZZ                                                                
-                                                                                 
diff --git a/README.md b/README.md
index 09fcf69765..8e9d1cf38e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,30 @@
-RIOT OS
-=======
-RIOT - The revolutionary IoT OS!
+                          ZZZZZZ                                                
+                        ZZZZZZZZZZZZ                                             
+                      ZZZZZZZZZZZZZZZZ                                           
+                     ZZZZZZZ     ZZZZZZ                                          
+                    ZZZZZZ        ZZZZZ                                          
+                    ZZZZZ          ZZZZ                                          
+                    ZZZZ           ZZZZZ                                         
+                    ZZZZ           ZZZZ                                          
+                    ZZZZ          ZZZZZ                                          
+                    ZZZZ        ZZZZZZ                                           
+                    ZZZZ     ZZZZZZZZ       777        7777       7777777777     
+              ZZ    ZZZZ   ZZZZZZZZ         777      77777777    77777777777     
+          ZZZZZZZ   ZZZZ  ZZZZZZZ           777     7777  7777       777         
+        ZZZZZZZZZ   ZZZZ    Z               777     777    777       777         
+       ZZZZZZ       ZZZZ                    777     777    777       777         
+      ZZZZZ         ZZZZ                    777     777    777       777         
+     ZZZZZ          ZZZZZ    ZZZZ           777     777    777       777         
+     ZZZZ           ZZZZZ    ZZZZZ          777     777    777       777         
+     ZZZZ           ZZZZZ     ZZZZZ         777     777    777       777         
+     ZZZZ           ZZZZ       ZZZZZ        777     777    777       777         
+     ZZZZZ         ZZZZZ        ZZZZZ       777     777    777       777         
+      ZZZZZZ     ZZZZZZ          ZZZZZ      777     7777777777       777         
+       ZZZZZZZZZZZZZZZ            ZZZZ      777      77777777        777         
+         ZZZZZZZZZZZ               Z                                             
+            ZZZZZ                                                                
+                                                                                 
+The friendly Operating System for IoT!
 
 RIOT OS is an operating system for Internet of Things (IoT) devices. It is based on a microkernel and designed for
 * energy efficiency
@@ -19,3 +43,13 @@ Its features comprise
 * TCP and UDP
 * 6LoWPAN
 * RPL
+
+License
+=======
+* All sources and binaries that have been developed at Freie Universität Berlin are
+  licensed under the GNU General Public License version 3 as published by the
+  Free Software Foundation.
+* Some external sources, especially files developed by SICS are published under
+  a separate license.
+  
+All code files contain licensing information.
-- 
GitLab