projects
/
wiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Edit page Affiliations
[wiki.git]
/
Affiliations
diff --git
a/Affiliations
b/Affiliations
index 3f75b45ba47ac7c88ddfe6bbdd3b79d93271d48f..186a81879fd3df9595042c2e7c5b634272336596 100644
(file)
--- a/
Affiliations
+++ b/
Affiliations
@@
-12,11
+12,6
@@
Software Engineer, [[http://www.google.com/|Google Inc.]]
----
----
-Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
-
-[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
-
-----
Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
@@
-48,6
+43,14
@@
Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
== Former Affiliations ==
== Former Affiliations ==
- * Contributor, [[http://uclinux.org/ | uClinux]]
+Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
+
+[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+
+----
+
+Contributor, [[http://uclinux.org/ | uClinux]]
+
+----
- * Developer, [[http://laptop.org/ | OLPC]]
+Operating System Engineer (volunteer), [[http://laptop.org/ | One Laptop Per Child]]
\ No newline at end of file