Permalink
Browse files

Merge

  • Loading branch information...
bos committed Oct 11, 2011
2 parents bbe993e + 6fbdf0c commit 338fe6254caf7e35603afe1582420584fcd96826
Showing with 21 additions and 21 deletions.
  1. +8 −8 notes/l5/chan.svg
  2. +8 −8 www/notes/chan.svg
  3. +3 −3 www/sched/index.html
  4. +2 −2 www/sched/sched.html
View
@@ -10,10 +10,10 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="581.11237"
+ width="631.63184"
height="395.64453"
preserveAspectRatio="xMinYMin meet"
- viewBox="0 0 581.11236 395.64453"
+ viewBox="0 0 631.63183 395.64453"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
@@ -79,20 +79,20 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4121831"
- inkscape:cx="356.02806"
+ inkscape:cx="381.02806"
inkscape:cy="200.56867"
inkscape:current-layer="layer1"
id="namedview6"
showgrid="true"
units="px"
inkscape:window-width="1344"
inkscape:window-height="967"
- inkscape:window-x="458"
- inkscape:window-y="-9"
+ inkscape:window-x="455"
+ inkscape:window-y="-38"
inkscape:window-maximized="0"
fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
+ fit-margin-left="25"
+ fit-margin-right="25"
fit-margin-bottom="0"
inkscape:snap-global="true">
<inkscape:grid
@@ -121,7 +121,7 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1,-170.32422)">
+ transform="translate(26,-170.32422)">
<g
id="g3861"
transform="translate(-101,0)">
View
@@ -10,10 +10,10 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="581.11237"
+ width="631.63184"
height="395.64453"
preserveAspectRatio="xMinYMin meet"
- viewBox="0 0 581.11236 395.64453"
+ viewBox="0 0 631.63183 395.64453"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
@@ -79,20 +79,20 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4121831"
- inkscape:cx="356.02806"
+ inkscape:cx="381.02806"
inkscape:cy="200.56867"
inkscape:current-layer="layer1"
id="namedview6"
showgrid="true"
units="px"
inkscape:window-width="1344"
inkscape:window-height="967"
- inkscape:window-x="458"
- inkscape:window-y="-9"
+ inkscape:window-x="455"
+ inkscape:window-y="-38"
inkscape:window-maximized="0"
fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
+ fit-margin-left="25"
+ fit-margin-right="25"
fit-margin-bottom="0"
inkscape:snap-global="true">
<inkscape:grid
@@ -121,7 +121,7 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1,-170.32422)">
+ transform="translate(26,-170.32422)">
<g
id="g3861"
transform="translate(-101,0)">
View
@@ -55,12 +55,12 @@ <h1><a class='aos' href='..'>CS240h</a> schedule</h1>
</td>
<td class="sylcol" valign=top>
- <b><a href="../notes/memory-slides.html">FFI, memory</a></b> (dm)<br>
+ <b><a href="../notes/memory-slides.html">memory</a></b> (dm)<br>
<span class="due">Due: lab 1</span>
</td>
<td class="sylcol" valign=top>
-<b><a href="../notes/testing-slides.html">Testing/Quickcheck</a></b> (bos)<br>
+<b>Testing/Quickcheck</b> (bos)<br>
</td>
</tr>
@@ -72,7 +72,7 @@ <h1><a class='aos' href='..'>CS240h</a> schedule</h1>
</td>
<td class="sylcol" valign=top>
-<b>Concurrency</b> (dm)<br>
+<b><a href="../notes/concurrency-slides.html">Concurrency</a></b> (dm)<br>
</td>
<td class="sylcol" valign=top>
View
@@ -8,7 +8,7 @@
</td>
<td class="sylcol" valign=top>
- <b><a href="../notes/memory-slides.html">FFI, memory</a></b> (dm)<br>
+ <b><a href="../notes/memory-slides.html">memory</a></b> (dm)<br>
<span class="due">Due: lab 1</span>
</td>
@@ -17,7 +17,7 @@
</td>
<td class="sylcol" valign=top>
-<b>Concurrency</b> (dm)<br>
+<b><a href="../notes/concurrency-slides.html">Concurrency</a></b> (dm)<br>
</td>
<td class="sylcol" valign=top>

0 comments on commit 338fe62

Please sign in to comment.