summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conferences.html1
-rwxr-xr-xpeople.html4
2 files changed, 5 insertions, 0 deletions
diff --git a/conferences.html b/conferences.html
index ca3728b..70eebe9 100644
--- a/conferences.html
+++ b/conferences.html
@@ -40,6 +40,7 @@
40 <tr><td style="color: red">May&nbsp;16,&nbsp;2010</td><td><a href="http://www.rtss.org">RTSS</a></td><td>San Diego, CA</td><td>Dec.&nbsp;1-3,&nbsp;2010</td></tr> 40 <tr><td style="color: red">May&nbsp;16,&nbsp;2010</td><td><a href="http://www.rtss.org">RTSS</a></td><td>San Diego, CA</td><td>Dec.&nbsp;1-3,&nbsp;2010</td></tr>
41 <tr><td style="color: red">Jun.&nbsp;6,&nbsp;2010</td><td><a href="http://www.irit.fr/rtns2010">RTNS</a></td><td>Toulouse, FR</td><td>Nov.&nbsp;4-5,&nbsp;2010</td></tr> 41 <tr><td style="color: red">Jun.&nbsp;6,&nbsp;2010</td><td><a href="http://www.irit.fr/rtns2010">RTNS</a></td><td>Toulouse, FR</td><td>Nov.&nbsp;4-5,&nbsp;2010</td></tr>
42 <tr><td style="color: red">July&nbsp;25,&nbsp;2010</td><td><a href="http://www.opodis.net">OPODIS</a></td><td>Tozeur, Tunisia</td><td>Dec.&nbsp;14-17,&nbsp;2010</td></tr> 42 <tr><td style="color: red">July&nbsp;25,&nbsp;2010</td><td><a href="http://www.opodis.net">OPODIS</a></td><td>Tozeur, Tunisia</td><td>Dec.&nbsp;14-17,&nbsp;2010</td></tr>
43 <tr><td>TBA</td><td><a href="http://fm.csl.sri.com/LAW/2010/index.shtml">Layered Assurance Workshop</a></td><td>Austin, TX</td><td>Dec.&nbsp;6-7,&nbsp;2010</td></tr>
43 <tr><td>Oct.&nbsp;1,&nbsp;2010</td><td><a href="http://www.ipdps.org">IPDPS</a></td><td>Anchorage, AK</td><td>May&nbsp;16-20,&nbsp;2011</td></tr> 44 <tr><td>Oct.&nbsp;1,&nbsp;2010</td><td><a href="http://www.ipdps.org">IPDPS</a></td><td>Anchorage, AK</td><td>May&nbsp;16-20,&nbsp;2011</td></tr>
44 <tr><td>Oct.&nbsp;8,&nbsp;2010</td><td><a href="http://www.rtas.org/">RTAS</a></td><td>Chicago, Il</td><td>Apr.&nbsp;11-14,&nbsp;2011</td></tr> 45 <tr><td>Oct.&nbsp;8,&nbsp;2010</td><td><a href="http://www.rtas.org/">RTAS</a></td><td>Chicago, Il</td><td>Apr.&nbsp;11-14,&nbsp;2011</td></tr>
45 <tr><td>Oct.&nbsp;10,&nbsp;2010</td><td><a href="http://eurosys2011.cs.uni-salzburg.at/">EuroSys</a></td><td>Salzburg, Austria</td><td>April&nbsp;10-13,&nbsp;2011</td></tr> 46 <tr><td>Oct.&nbsp;10,&nbsp;2010</td><td><a href="http://eurosys2011.cs.uni-salzburg.at/">EuroSys</a></td><td>Salzburg, Austria</td><td>April&nbsp;10-13,&nbsp;2011</td></tr>
diff --git a/people.html b/people.html
index 0538094..605f308 100755
--- a/people.html
+++ b/people.html
@@ -59,6 +59,10 @@
59 <li><a href="http://www.cs.unc.edu/~gurua/">Guruprasad Aphale</a> (since August 2009)</li> 59 <li><a href="http://www.cs.unc.edu/~gurua/">Guruprasad Aphale</a> (since August 2009)</li>
60 <li><a href="http://www.cs.unc.edu/~jerickso/">Jeremy Erickson</a> (since August 2009)</li> 60 <li><a href="http://www.cs.unc.edu/~jerickso/">Jeremy Erickson</a> (since August 2009)</li>
61 <li><a href="http://www.cs.unc.edu/~lihaohan/">Haohan Li</a> (since August 2009)</li> 61 <li><a href="http://www.cs.unc.edu/~lihaohan/">Haohan Li</a> (since August 2009)</li>
62 <li><a href="http://www.cs.unc.edu/~bipasa/">Bipasa Chattopadhyay</a> (since August 2010)</li>
63 <li><a href="http://www.cs.unc.edu/~hermanjl/">Jonathan Herman</a> (since August 2010)</li>
64 <li><a href="http://www.cs.unc.edu/~cjk/">Christopher Kenna</a> (since August 2010)</li>
65 <li><a href="http://www.cs.unc.edu/~chsun/">Chih-Hao Sun</a> (since August 2010)</li>
62 </ul> 66 </ul>
63 67
64 <h2 style="clear: both;">Visiting Scholars</h2> 68 <h2 style="clear: both;">Visiting Scholars</h2>