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 e3f6b92f3b6ec54ef97aa085e4548632f0d51126..186a81879fd3df9595042c2e7c5b634272336596 100644
(file)
--- a/
Affiliations
+++ b/
Affiliations
@@
-1,14
+1,21
@@
== Current Affiliations ==
== Current Affiliations ==
-
Infrastructure Team coordinator
, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+
Coordinator of the Infrastructure Team
, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
[[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
----
[[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
----
-S
ystem Administrator Intern, Member, [[http://fsf.org/ | Free Software Foundation
]]
+S
oftware Engineer, [[http://www.google.com/|Google Inc.
]]
-[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+[[http://www.google.com/ | http://www.google.com/images/logos/google_logo_41.png]]
+
+----
+
+
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
+
+[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
----
----
@@
-26,7
+33,7
@@
Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
Contributor, former System Architect, [[http://www.bertos.org/ | BeRTOS]]
Contributor, former System Architect, [[http://www.bertos.org/ | BeRTOS]]
-[[http://www.bertos.org | http://www.bertos.org/
static/14a32621f4d893117e06fe0019952f3220bbe4f8
/avatars/bertos-en.png]]
+[[http://www.bertos.org | http://www.bertos.org/
media/web-stuff
/avatars/bertos-en.png]]
----
----
@@
-36,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