diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 16:22:08 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 16:22:08 +0200 |
| commit | ca39ad0592e9b99dac9d99c68bb36ef1d27f72df (patch) | |
| tree | 5ad12783d506039cd440ccfacbac264085137075 /history.mdwn | |
| parent | be2307c1bf9aef3e22984dd298827d8e1ca18b2c (diff) | |
| parent | 264b066cd313b23f6748711c6f9b4d3336e03136 (diff) | |
Merge branch 'master' of braunbox:~hurd-web/hurd-web
Diffstat (limited to 'history.mdwn')
| -rw-r--r-- | history.mdwn | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/history.mdwn b/history.mdwn index ecb09032..c2add410 100644 --- a/history.mdwn +++ b/history.mdwn @@ -139,5 +139,7 @@ mailing lists. report|news/2012-q1-q2]]. * 2013: [Talk at FOSDEM](https://fosdem.org/2013/schedule/event/hurd_microkernel/), [[Debian - GNU/Hurd 2013|news/2013-05-debian_gnu_hurd_2013]]. - * [Talk at GHM in Paris](http://www.gnu.org/ghm/2013/paris/) ([video](http://www.irill.org/videos/GNU_Hackers_Meeting_2013/Samuel_Thibault-Hurd_recent_developments.webm)) + GNU/Hurd 2013|news/2013-05-debian_gnu_hurd_2013]], talk at the [[GNU + Hackers Meeting in Paris|community/meetings/ghm2013]], *Happy 30th + birthday, GNU*: [[GNU Hurd 0.5, GNU Mach 1.4, GNU MIG 1.4 + released|news/2013-09-27]]. |