Merge OLPC changes

diff --git a/OneLaptopPerChild b/OneLaptopPerChild
index 630b89035df06fbf46c79a9aa86297b599c49d44..b179c4c75a5f73510478bb2244b4a766d188c26e 100644 (file)
--- a/OneLaptopPerChild
+++ b/OneLaptopPerChild
@@ -41,8 +41,8 @@
 
 ----
 
-**Due to questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
+**Due to unclear and questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
 
-OneWindozePerChild.png
+{{OneWindozePerChild.png}}
 
-Instead, I'm working on [[SugarLabs]]. 
+Instead, I'm working on the [[SugarLabs]] foundation.

diff --git a/OneLaptopPerChild.orig b/OneLaptopPerChild.orig
deleted file mode 100644 (file)
index 630b890..0000000
--- a/OneLaptopPerChild.orig
+++ /dev/null
@@ -1,48 +0,0 @@
-== Experimental packages ==
-
- * xtest OS images: http://bender.codewiz.org/pub/olpc/streams/xtest/
- * yum repository: http://www.codewiz.org/pub/olpc-bernie/
-
-== General Info ==
-
- * Public website: http://www.laptop.org/
- * Project wiki: http://wiki.laptop.org/
- * Developer resources: http://dev.laptop.org/
- * See the ExOh laptop in action!
-
-== My Work ==
-
-=== Ongoing ===
-
- * Performance tuning (Xorg, cairo, initscripts...)
- * Random kernel hacking: https://www.develer.com/gitweb/pub/users/bernie/olpc-2.6-master
- * Maintaining changes to XKB keyboard definitions (xkeyboard-config)
- * RPM packaging work: https://admin.fedoraproject.org/pkgdb/users/packages/bernie
-
-=== Specific tasks ===
-
- * Competitive strategies against the TwoHundredDollarLaptop (TODO)
- * Upgrading the OLPC bathrooms to BadVista (DONE)
- * Porting Xorg 1.4 to the OLPC: XorgOlpcTasks (DONE)
- * Porting Xorg 1.4.99 to the OLPC: http://www.codewiz.org/pub/olpc/xorg1499/
- * Optimized glibc 2.7: http://www.codewiz.org/pub/olpc/glibc-geode-2.7/
- * Localization: EthiopianLocale
- * Sugarizing the XaoS activitiy: http://wiki.laptop.org/go/XaoS
- * Sugarizing the Linux SoundTracker
- * OneAmigaPerChild emulation pet project
-
-== My Bugs ==
-
- * Assigned to me: http://dev.laptop.org/query?owner=bernie
- * Reported by me: http://dev.laptop.org/query?reporter=bernie
- * Commented by me: https://dev.laptop.org/query?cc=bernie
-
-[[http://www.laptopgiving.org/ | GiveOneGetOne.jpg]]
-
-----
-
-**Due to questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
-
-OneWindozePerChild.png
-
-Instead, I'm working on [[SugarLabs]]. 

diff --git a/OneLaptopPerChild.rej b/OneLaptopPerChild.rej
deleted file mode 100644 (file)
index 4191f90..0000000
--- a/OneLaptopPerChild.rej
+++ /dev/null
@@ -1,19 +0,0 @@
-***************
-*** 41,48 ****
-  
-  ----
-  
-- **Due to questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
-  
-- OneWindozePerChild.png
-  
-- Instead, I'm working on [[SugarLabs]].
---- 41,48 ----
-  
-  ----
-  
-+ **Due to unclear and questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
-  
-+ {{OneWindozePerChild.png}}
-  
-+ Instead, I'm working on the [[SugarLabs]] foundation.