summaryrefslogtreecommitdiff
path: root/community/gsoc.mdwn
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-09-28 16:22:08 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-09-28 16:22:08 +0200
commitca39ad0592e9b99dac9d99c68bb36ef1d27f72df (patch)
tree5ad12783d506039cd440ccfacbac264085137075 /community/gsoc.mdwn
parentbe2307c1bf9aef3e22984dd298827d8e1ca18b2c (diff)
parent264b066cd313b23f6748711c6f9b4d3336e03136 (diff)
Merge branch 'master' of braunbox:~hurd-web/hurd-web
Diffstat (limited to 'community/gsoc.mdwn')
-rw-r--r--community/gsoc.mdwn7
1 files changed, 6 insertions, 1 deletions
diff --git a/community/gsoc.mdwn b/community/gsoc.mdwn
index b1af6318..7e355ec4 100644
--- a/community/gsoc.mdwn
+++ b/community/gsoc.mdwn
@@ -58,12 +58,16 @@ establish and get used to different communication channels.
[Timeline](http://www.google-melange.com/gsoc/events/google/gsoc2013).
+<!--
+
As
boring as it is, but the next step is waiting: we will have to wait for Google
to announce the number of slots that the whole GNU project gets, and we'll be
discussing with our GNU peers about how to split these up among all the GNU
subprojects.
+-->
+
# Possible projects
@@ -95,4 +99,5 @@ project, getting one slot each year. In the following year, we successfully
participated on our own, instead of as a suborganization of the GNU project.
Read about our five students' success on the [[2008]] page. In the next years,
we again participated under the GNU umbrella with one slot in [[2009]], three
-in [[2010]], one in [[2011]], and two in [[2012]].
+in [[2010]], one in [[2011]], two in [[2012]], three in [[2013]] (one GNU, one
+GCC, one Debian).