merge updates from server

This commit is contained in:
Wookey 2015-03-25 00:30:53 +00:00
commit 2eabe1431d
3 changed files with 34 additions and 14 deletions

View File

@ -602,7 +602,7 @@ LIST OF ROPES LEFT - Far From Support double traverse
<hr />
<div class="tripdate" id="t2012-08-xx">2012-08-</div>
<div class="tripdate" id="t2012-08-xx">2012-08-13</div>
<div class="trippeople">Duncan, <u>Andrew</u></div>
<div class="triptitle">139 Rock'n'Roll H&ouml;hle</div>
<p><div class="timeug">T/U: 5hrs</div></p>
@ -709,7 +709,7 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out
<hr />
<div class="tripdate" id="t2012-08-18a">18th August</div>
<div class="tripdate" id="t2012-08-18a">2012-08-18</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="triptitle">2012-70 Doppel Gemseh&ouml;hle</div>
@ -719,7 +719,7 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out
<hr />
<div class="tripdate" id="t2012-08-18b">18&middot;8&middot;12</div>
<div class="tripdate" id="t2012-08-18b">2012-08-18</div>
<div class="trippeople">Olly M, Serena, Wook, Tess, Dave Loeffler, Sarah, Martin G, Stuart, Frank, <u>Julian</u></div>
<div class="triptitle">Strubklamm</div>
@ -729,7 +729,7 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out
<hr />
<div class="tripdate" id="t2012-08-19a">19&middot;8&middot;12</div>
<div class="tripdate" id="t2012-08-19a">2012-08-19</div>
<div class="trippeople">Becka + <u>Julian</u> + Holly + Noel</div>
<div class="triptitle">204a - Runnel Stone</div>
@ -739,7 +739,7 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out
<hr />
<div class="tripdate" id="t2012-08-20a"><!-- deduced that this is the 20th --></div>
<div class="tripdate" id="t2012-08-20a">2012-08-20</div>
<div class="trippeople">Noel + <u>Julian</u></div>
<div class="triptitle">Surface prospecting above March of the Penguins</div>
@ -832,7 +832,7 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out
<hr />
<div class="tripdate" id="t2012-08-xxb">2012-08-</div>
<div class="tripdate" id="t2012-08-xxb">2012-08-01</div>
<div class="trippeople">Frank, Jess, <u>Stu W</u></div>
<div class="triptitle">D&ouml;ppelgemzeh&ouml;le - 2012-JS1</div>
@ -840,7 +840,7 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out
<hr />
<div class="tripdate" id="t2012-08-xxc">2012-08-</div>
<div class="tripdate" id="t2012-08-xxc">2012-08-01</div>
<div class="trippeople"><u>Stu W</u>, Frank</div>
<div class="triptitle">"Bullets second h&ouml;le" 2011-01</div>
@ -848,7 +848,7 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out
<hr />
<div class="tripdate" id="t2012-08-xxd">2012-08-</div>
<div class="tripdate" id="t2012-08-xxd">2012-08-01</div>
<div class="trippeople">Frank, Martin, <u>Stu W</u></div>
<div class="triptitle">"Bullets second h&ouml;le" 2011-01</div>
@ -857,7 +857,7 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out
<hr />
<div class="tripdate" id="t2012-08-xxe">2012-08-</div>
<div class="tripdate" id="t2012-08-xxe">2012-08-01</div>
<div class="trippeople"><u>Stu W</u></div>
<div class="triptitle">Prospecting (2012-SW0x)</div>
@ -980,7 +980,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
<hr />
<div class="tripdate" id="t2012-08-25b"><u>25th August 2012</u></div>
<div class="tripdate" id="t2012-08-25b">2012-08-25</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="triptitle">107 - south of entrance</div>
@ -990,7 +990,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
<hr />
<div class="tripdate" id="t2012-08-26a"><u>26th August 2012</u></div>
<div class="tripdate" id="t2012-08-26a">2012-08-26</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="triptitle">107 - north of entrance</div>
@ -1000,7 +1000,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
<hr />
<div class="tripdate" id="t2012-08-27b"><u>27th August 2012</u></div>
<div class="tripdate" id="t2012-08-27b">2012-08-27</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="triptitle">107 - Ropeless</div>
@ -1014,7 +1014,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
<hr />
<div class="tripdate" id="t2012-08-28b"><u>28th August 2012</u></div>
<div class="tripdate" id="t2012-08-28b">2012-08-28</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="triptitle">148 derig</div>
@ -1024,7 +1024,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
<hr />
<div class="tripdate" id="t2012-08-29a"><u>29th August 2012</u></div>
<div class="tripdate" id="t2012-08-29a">2012-08-29</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="triptitle">157</div>

View File

@ -0,0 +1,19 @@
<html>
<head>
<title>Food Bought</title>
</head>
<body>
<h1>Food bought 2014</h1>
<ul>
<li>? Curries</li>
<li>? Flapjack</li>
<li>? Noodles</li>
<ul>
<li>300 in Cambridge before expo</li>
</ul>
<li>? Soup</li>
<li>etc</li>
</ul>
</body>
</html>

View File

@ -17,6 +17,7 @@
<li><a href="logbook.html">Logbook</a> <a href="../../expoimages/writeups/2014/logbook.pdf">(pdf scan)</a></li>
<li><a href="topcamplist.html">Things left at top camp</a></li>
<li><a href="basecamplist.html">Things left at base camp</a></li>
<li><a href="foodbought.html">Food Bought</a></li>
</ul>
</div>
<hr />