diff options
| author | Björn B. Brandenburg <bbb@cs.unc.edu> | 2009-12-05 15:52:49 -0500 |
|---|---|---|
| committer | Björn B. Brandenburg <bbb@cs.unc.edu> | 2009-12-05 15:52:49 -0500 |
| commit | cd9404a87843b135c8997f22c00be18bc4e7fc5c (patch) | |
| tree | 8a1476990dcdd192e4b5a3d2f2c0e75a93eb7fb7 /index.html | |
| parent | dc1d039f6bf74a16cab4d8601021ef5b1904318e (diff) | |
| parent | c3287ff446cf62682038b03431c2719671b826ae (diff) | |
Merge branch 'master' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/rthp
Conflicts:
index.html
Diffstat (limited to 'index.html')
| -rwxr-xr-x | index.html | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -42,7 +42,7 @@ | |||
| 42 | <div class="newsitem"> | 42 | <div class="newsitem"> |
| 43 | <p class="date">September 2009</p> | 43 | <p class="date">September 2009</p> |
| 44 | <h3>Visiting Researcher</h3> | 44 | <h3>Visiting Researcher</h3> |
| 45 | <p>The UNC Real-Time Systems Group welcomes <a href="http://rts.eit.uni-kl.de/index.php?id=18&people_action=detail&people_id=8">Raphael Guerra</a> (of TU Kaiserslautern). Raphael will stay for two months and collaborate on scheduling-theoretic while at UNC. | 45 | <p>The UNC Real-Time Systems Group welcomes <a href="http://rts.eit.uni-kl.de%2Findex.php%3Fid%3D18%26people_action%3Ddetail%26people_id%3D8">Raphael Guerra</a> (of TU Kaiserslautern). Raphael will stay for two months and collaborate on scheduling-theoretic while at UNC. |
| 46 | </p> | 46 | </p> |
| 47 | </div> | 47 | </div> |
| 48 | <div class="newsitem"> | 48 | <div class="newsitem"> |