diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-24 19:19:21 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-24 19:19:21 +0100 |
| commit | 07cd74da368b1baca286cedf6d743a48792d15f5 (patch) | |
| tree | 27162d59cd32f53493977b6fe7a50420de0eb5cf /community | |
| parent | e21fadaf306d17c53055153bd1fe3797886eeb26 (diff) | |
| parent | e164cc3bc34b10fb415d146dcc1db3abe12fb1d2 (diff) | |
Merge commit 'e21fadaf306d17c53055153bd1fe3797886eeb26'; commit 'e164cc3bc34b10fb415d146dcc1db3abe12fb1d2' into HEAD
Diffstat (limited to 'community')
| -rw-r--r-- | community/gsoc.mdwn | 13 | ||||
| -rw-r--r-- | community/meetings.mdwn | 4 | ||||
| -rw-r--r-- | community/meetings/fosdem_2016.mdwn | 3 |
3 files changed, 14 insertions, 6 deletions
diff --git a/community/gsoc.mdwn b/community/gsoc.mdwn index bd68b3fa..6c66129d 100644 --- a/community/gsoc.mdwn +++ b/community/gsoc.mdwn @@ -1,5 +1,5 @@ -[[!meta copyright="Copyright © 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free -Software Foundation, Inc."]] +[[!meta copyright="Copyright © 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, +2016 Free Software Foundation, Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable id="license" text="Permission is granted to copy, distribute and/or modify this @@ -20,16 +20,21 @@ We're in! The GNU Hurd project is again participating in the [Google Summer of Code](http://www.google-melange.com/) under the [GNU umbrella](http://www.gnu.org/software/soc-projects/). +<!-- This year's *student application period* is over. Thanks for sending in your applications! We're now reviewing and discussing these, so please pay attention to any questions posted on your proposal's page. The Google site's notification system should be sending out emails, too. +--> -Per the [Google Summer of Code 2015 Program -Timeline](http://www.google-melange.com/gsoc/events/google/gsoc2015), +Per the [Google Summer of Code 2016 Program +Timeline](https://summerofcode.withgoogle.com/), +we are awaiting for the approval of GNU as a mentoring organization. +<!-- we're now waiting 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. +--> <!-- from 2015-03-16 to 2015-03-27, it's the *student application period*, which is plenty of time for preparing and discussing your applications -- but please diff --git a/community/meetings.mdwn b/community/meetings.mdwn index 98ced949..c3e8529a 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -1,5 +1,5 @@ [[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, -2015 Free Software Foundation, Inc."]] +2015, 2016 Free Software Foundation, Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable id="license" text="Permission is granted to copy, distribute and/or modify this @@ -14,8 +14,10 @@ License|/fdl]]."]]"""]] # Upcoming + # Past + * [[FOSDEM_2016]] * [[DebConf15]] * [[FOSDEM_2015]] * [[FOSDEM_2014]] diff --git a/community/meetings/fosdem_2016.mdwn b/community/meetings/fosdem_2016.mdwn index 361167ba..f175af09 100644 --- a/community/meetings/fosdem_2016.mdwn +++ b/community/meetings/fosdem_2016.mdwn @@ -22,6 +22,7 @@ Bruxelles. [[!table class="table_style_1" data=""" "Name","Attending","Arrival","Return" "Samuel Thibault","yes","Saturday, 09:17 BRU","Sunday, 19:13 BRU" +"[[Thomas Schwinge|tschwinge]]","yes","Friday, 17:35, Bruxelles Midi","Sunday, 18:25, Bruxelles Midi" """]] @@ -36,6 +37,6 @@ Bruxelles. thibault_hurd: - "presentation by Samuel Thibault: [*Hurd, Rump kernel, sound, and usb*]" + "presentation by Samuel Thibault: [*Hurd, Rump kernel, sound, and usb*]"(https://fosdem.org/2016/schedule/event/microkernels_hurd_rump_sound_usb/) ([slides](https://fosdem.org/2016/schedule/event/microkernels_hurd_rump_sound_usb/attachments/slides/951/export/events/attachments/microkernels_hurd_rump_sound_usb/slides/951/2016_01_30_fosdem.pdf)) """]] |