diff options
author | bipasa <bipasac2000@gmail.com> | 2012-02-01 12:09:15 -0500 |
---|---|---|
committer | bipasa <bipasac2000@gmail.com> | 2012-02-01 12:09:15 -0500 |
commit | 812812e8e4ab611578e781f699dc5ca5b63bc5fb (patch) | |
tree | c38a8cc17808cc8a4c6d555b2f0537b0b167b305 | |
parent | e5bca5aee22980fa171688a213af8d3abdfed04f (diff) | |
parent | 900c9b2db81850b5a23635aaa8ff7805fc7bb6be (diff) |
Merge branch 'master' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/rthp
-rw-r--r-- | conferences.csv | 2 | ||||
-rw-r--r-- | conferences.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conferences.csv b/conferences.csv index 6a4391b..e46aeb1 100644 --- a/conferences.csv +++ b/conferences.csv | |||
@@ -6,7 +6,7 @@ ETFA,http://www.etfa2012.org/,"Krakow, Poland",3/25/2012,9/17/2012,9/21/2012 | |||
6 | RTCSA,http://rtcsa.konkuk.ac.kr/,"Seoul, Korea",4/16/2012,8/20/2012,8/22/2012 | 6 | RTCSA,http://rtcsa.konkuk.ac.kr/,"Seoul, Korea",4/16/2012,8/20/2012,8/22/2012 |
7 | "ESWeek (3 Conferences)",http://www.esweek.org/,"Tampere, Finland",4/11/2011,10/9/2011,10/14/2011 | 7 | "ESWeek (3 Conferences)",http://www.esweek.org/,"Tampere, Finland",4/11/2011,10/9/2011,10/14/2011 |
8 | RTLWS,https://www.osadl.org/RTLWS-2012.rtlws-2012.0.html,"Chapel Hill, NC",TBD,10/18/2012,10/20/2012 | 8 | RTLWS,https://www.osadl.org/RTLWS-2012.rtlws-2012.0.html,"Chapel Hill, NC",TBD,10/18/2012,10/20/2012 |
9 | RTNS,http://rtns2011.irccyn.ec-nantes.fr/#page=home,"Nancy, France",TBD,11/8/2012,11/9/2012 | 9 | RTNS,http://rtns2012.loria.fr/,"Pont a Mousson, France",6/1/2012,11/8/2012,11/9/2012 |
10 | OPODIS,http://www.opodis.net/,"Toulouse, France",7/22/2011,12/12/2011,12/16/2011 | 10 | OPODIS,http://www.opodis.net/,"Toulouse, France",7/22/2011,12/12/2011,12/16/2011 |
11 | IPDPS,http://www.ipdps.org/,"Shanghai, China",10/2/2011,5/21/2012,5/25/2012 | 11 | IPDPS,http://www.ipdps.org/,"Shanghai, China",10/2/2011,5/21/2012,5/25/2012 |
12 | LAW,http://www.acsac.org/2011/workshops/law/,"Orlando, FA",9/29/2011,12/5/2011,12/9/2011 | 12 | LAW,http://www.acsac.org/2011/workshops/law/,"Orlando, FA",9/29/2011,12/5/2011,12/9/2011 |
diff --git a/conferences.html b/conferences.html index efbfbb9..e97c3d0 100644 --- a/conferences.html +++ b/conferences.html | |||
@@ -45,8 +45,8 @@ | |||
45 | <tr><td>Mar. 25, 2012</td><td><a href="http://www.etfa2012.org/">ETFA</a></td><td>Krakow, Poland</td><td>Sep. 17 – 21, 2012</td></tr> | 45 | <tr><td>Mar. 25, 2012</td><td><a href="http://www.etfa2012.org/">ETFA</a></td><td>Krakow, Poland</td><td>Sep. 17 – 21, 2012</td></tr> |
46 | <tr><td>Apr. 16, 2012</td><td><a href="http://rtcsa.konkuk.ac.kr/">RTCSA</a></td><td>Seoul, Korea</td><td>Aug. 20 – 22, 2012</td></tr> | 46 | <tr><td>Apr. 16, 2012</td><td><a href="http://rtcsa.konkuk.ac.kr/">RTCSA</a></td><td>Seoul, Korea</td><td>Aug. 20 – 22, 2012</td></tr> |
47 | <tr><td>May. 15, 2012</td><td><a href="http://sites.ieee.org/rtss2012/">RTSS</a></td><td>San Juan, Puerto Rico</td><td>Dec. 5 – 7, 2012</td></tr> | 47 | <tr><td>May. 15, 2012</td><td><a href="http://sites.ieee.org/rtss2012/">RTSS</a></td><td>San Juan, Puerto Rico</td><td>Dec. 5 – 7, 2012</td></tr> |
48 | <tr><td>Jun. 1, 2012</td><td><a href="http://rtns2012.loria.fr/">RTNS</a></td><td>Pont a Mousson, France</td><td>Nov. 8 – 9, 2012</td></tr> | ||
48 | <tr><td>TBD</td><td><a href="https://www.osadl.org/RTLWS-2012.rtlws-2012.0.html">RTLWS</a></td><td>Chapel Hill, NC</td><td>Oct. 18 – 20, 2012</td></tr> | 49 | <tr><td>TBD</td><td><a href="https://www.osadl.org/RTLWS-2012.rtlws-2012.0.html">RTLWS</a></td><td>Chapel Hill, NC</td><td>Oct. 18 – 20, 2012</td></tr> |
49 | <tr><td>TBD</td><td><a href="http://rtns2011.irccyn.ec-nantes.fr/#page=home">RTNS</a></td><td>Nancy, France</td><td>Nov. 8 – 9, 2012</td></tr> | ||
50 | </table> | 50 | </table> |
51 | </div> | 51 | </div> |
52 | </div> | 52 | </div> |