diff options
| author | Bipasa Chattopadhyay <bipasa@bipasa.cs.unc.edu> | 2011-12-06 12:25:00 -0500 |
|---|---|---|
| committer | Bipasa Chattopadhyay <bipasa@bipasa.cs.unc.edu> | 2011-12-06 12:25:00 -0500 |
| commit | 02ee262d70d74bf2f9bb64e62dd9527def707801 (patch) | |
| tree | 7cb1c760ac7e91fe7bd864bf89ea8bd2efbca92f | |
| parent | de00a679ac72c00a1f93a25a9f993b572dc560a3 (diff) | |
| parent | ea5a2479c0e238690de620689edd9baa1b0a5a93 (diff) | |
Merge branch 'master' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/rthp
| -rw-r--r-- | photos.html | 13 | ||||
| -rw-r--r-- | vienna.jpg | bin | 0 -> 424419 bytes | |||
| -rw-r--r-- | vienna_small.jpg | bin | 0 -> 150459 bytes |
3 files changed, 13 insertions, 0 deletions
diff --git a/photos.html b/photos.html index df271d5..15a4cff 100644 --- a/photos.html +++ b/photos.html | |||
| @@ -28,6 +28,19 @@ Lunch</span></a></li> | |||
| 28 | <div id="content"> | 28 | <div id="content"> |
| 29 | <h2>Conferences</h2> | 29 | <h2>Conferences</h2> |
| 30 | <br /> | 30 | <br /> |
| 31 | <a href="vienna.jpg"><img src="vienna_small.jpg" alt="Real-time group members in Vienna" class="left" height="167" width="250" /></a><br /> | ||
| 32 | <br /> | ||
| 33 | <br /> | ||
| 34 | <br /> | ||
| 35 | Vienna, Austria (RTSS 11) <br /> | ||
| 36 | <br /> | ||
| 37 | <br /> | ||
| 38 | <br /> | ||
| 39 | <br /> | ||
| 40 | <br /> | ||
| 41 | <br /> | ||
| 42 | <br /> | ||
| 43 | |||
| 31 | <img src="stockholm.jpg" alt="Left Align" class="left" height="172" width="250" /> <br /> | 44 | <img src="stockholm.jpg" alt="Left Align" class="left" height="172" width="250" /> <br /> |
| 32 | <br /> | 45 | <br /> |
| 33 | <br /> | 46 | <br /> |
diff --git a/vienna.jpg b/vienna.jpg new file mode 100644 index 0000000..2d09a37 --- /dev/null +++ b/vienna.jpg | |||
| Binary files differ | |||
diff --git a/vienna_small.jpg b/vienna_small.jpg new file mode 100644 index 0000000..dbc8c03 --- /dev/null +++ b/vienna_small.jpg | |||
| Binary files differ | |||
