diff options
Diffstat (limited to 'community')
| -rw-r--r-- | community/meetings.mdwn | 5 | ||||
| -rw-r--r-- | community/meetings/fosdem_2012.mdwn | 8 | ||||
| -rw-r--r-- | community/meetings/ghm2012.mdwn | 13 |
3 files changed, 20 insertions, 6 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index 4ae52a1a..19c5a533 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -1,4 +1,4 @@ -[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011 Free Software +[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable @@ -16,12 +16,13 @@ License|/fdl]]."]]"""]] ## In the Future - * [[FOSDEM_2012]] + * [[GNU Hackers Meeting, 2012, Düsseldorf|ghm2012]] * [[Self-organised]] # Past + * [[FOSDEM_2012]] * [[FrOSCon_2011]] * [[GNU Hackers Meeting, 2011, Paris|ghm2011]] * [[FOSDEM_2011]] diff --git a/community/meetings/fosdem_2012.mdwn b/community/meetings/fosdem_2012.mdwn index b6f31efc..8143e236 100644 --- a/community/meetings/fosdem_2012.mdwn +++ b/community/meetings/fosdem_2012.mdwn @@ -1,5 +1,5 @@ -[[!meta copyright="Copyright © 2006, 2007, 2008, 2009, 2010, 2011 Free Software -Foundation, Inc."]] +[[!meta copyright="Copyright © 2006, 2007, 2008, 2009, 2010, 2011, 2012 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 @@ -22,10 +22,10 @@ Bruxelles. [[!table class="table_style_1" data=""" "Name","Attending","Arrival","Return","Share room with us" "[[Maksym Planeta]]","no" -"Olaf Buddenhagen","most likely","","","yes" +"Olaf Buddenhagen","yes","","","yes" "Richard Braun","no" "Svante Signell","no" -"[[Thomas Schwinge|tschwinge]]","will try to","","","yes" +"[[Thomas Schwinge|tschwinge]]","no" """]] diff --git a/community/meetings/ghm2012.mdwn b/community/meetings/ghm2012.mdwn new file mode 100644 index 00000000..0e3c8cd5 --- /dev/null +++ b/community/meetings/ghm2012.mdwn @@ -0,0 +1,13 @@ +[[!meta copyright="Copyright © 2012 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 +document under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no Invariant +Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license +is included in the section entitled [[GNU Free Documentation +License|/fdl]]."]]"""]] + +[[!meta title="GNU Hackers Meeting, 2012, Düsseldorf"]] + +<http://www.gnu.org/ghm/2012/ddorf/> |