summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2012-07-12 13:04:07 +0200
committerThomas Schwinge <thomas@codesourcery.com>2012-07-12 13:04:07 +0200
commitbc642c08945c850f04ac41c0d42ea06d7cf08f5a (patch)
tree65571e0f1b03a5847bd0d204846ac2f78592f6ef
parent6fc942f66e0b9435939e63ad9aeeeee91cfbc200 (diff)
parent3aecc744ff639916fb3efd2f728aed460b19b426 (diff)
Merge remote-tracking branch 'kepler.SCHWINGE/master'
-rw-r--r--hurd/libihash.mdwn8
-rw-r--r--irc.mdwn4
-rw-r--r--media_appearances.mdwn13
3 files changed, 19 insertions, 6 deletions
diff --git a/hurd/libihash.mdwn b/hurd/libihash.mdwn
index 03ebae82..d6b8e8b6 100644
--- a/hurd/libihash.mdwn
+++ b/hurd/libihash.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2009, 2010, 2011 Free Software Foundation,
+[[!meta copyright="Copyright © 2009, 2010, 2011, 2012 Free Software Foundation,
Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -6,8 +6,8 @@ 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
[[!tag open_issue_hurd]]
@@ -48,6 +48,8 @@ is included in the section entitled
* libstdc++: `unordered_map`, `tr1/unordered_map`, `ext/hash_map`
+ * libiberty: `hashtab.c`
+
* <http://cmph.sourceforge.net/>
* <http://libhashish.sourceforge.net/>
diff --git a/irc.mdwn b/irc.mdwn
index 66f3c4c4..ebf63b97 100644
--- a/irc.mdwn
+++ b/irc.mdwn
@@ -1,5 +1,5 @@
[[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009,
-2010, 2011 Free Software Foundation, Inc."]]
+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
@@ -38,7 +38,7 @@ interactions, and other developers regularely took part, too.
For this reason, we decided to continue having these meetings, even if it's not
currently Google Summer of Code time.
Currently, the meetings take place in the **`#hurd` channel every
-Wednesday at 19:00 UTC** and are open to any interested party. So,
+Thursday at 19:00 UTC** and are open to any interested party. So,
everyone, take your chance to chat with GNU Hurd developers!
diff --git a/media_appearances.mdwn b/media_appearances.mdwn
index c005c381..3495a88e 100644
--- a/media_appearances.mdwn
+++ b/media_appearances.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2010, 2011 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 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
@@ -15,6 +16,16 @@ A lot of stuff is missing here.
[[!toc levels=2]]
+# 2012
+
+
+## April
+
+ * *[People behind Debian: Samuel Thibault, working on accessibility and the
+ Hurd](http://raphaelhertzog.com/2012/04/19/people-behind-debian-samuel-thibault-working-on-accessibility-and-the-hurd/)*,
+ Raphaël Hertzog, 2012-04-19
+
+
# 2011