Bladeren bron

Merged L & C issue fixes from trunk to branch.

[SVN r36246]
Andreas Huber 19 jaren geleden
bovenliggende
commit
7b4d5209b4
2 gewijzigde bestanden met toevoegingen van 73 en 32 verwijderingen
  1. 1 1
      libs/functional
  2. 72 31
      people/mark_rodgers.htm

+ 1 - 1
libs/functional

@@ -1 +1 @@
-Subproject commit a2202df1fe293890d9e350509c4eaf9387281a8d
+Subproject commit d2b04d968cc15bc8e4309cc0ba847bb1eeb21de5

+ 72 - 31
people/mark_rodgers.htm

@@ -1,33 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-    <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-    <meta name="ProgId" content="FrontPage.Editor.Document">
-    <title>Mark Rodgers</title>
-  </head>
-  <body bgcolor="#FFFFFF" text="#000000">
-    <table border="1" bgcolor="#007F7F" cellpadding="2">
-      <tr>
-        <td bgcolor="#FFFFFF"><img src="../boost.png" alt="boost.png (6897 bytes)" width="277" height="86"></td>
-        <td><a href="../index.htm"><font face="Arial" color="#FFFFFF"><big>Home</big></font></a></td>
-        <td><a href="../libs/libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries</big></font></a></td>
-        <td><a href="people.htm"><font face="Arial" color="#FFFFFF"><big>People</big></font></a></td>
-        <td><a href="../more/faq.htm"><font face="Arial" color="#FFFFFF"><big>FAQ</big></font></a></td>
-        <td><a href="../more/index.htm"><font face="Arial" color="#FFFFFF"><big>More</big></font></a></td>
-      </tr>
-    </table>
-    <p><a href="http://boost.sourceforge.net/photos/mark_rodgers.jpg"><img border="0" src="http://boost.sourceforge.net/photos/mark_rodgers_small.jpg" alt="mark_rodgers.jpg (23035 bytes)" align="left" hspace="10" vspace="5" width="100" height="75"></a>Mark 
-      Rodgers lives in <a href="http://www.wellington.govt.nz/">Wellington</a>, 
-      the capital of New Zealand, 
-      with his wife, Clare, and their son, Ronnie.</p>
-    <p>He studied Computer Science at <a href="http://www.vuw.ac.nz/home/index.asp">Victoria 
-        University of Wellington</a> from 1983 to 1986, completing a <nobr>B.Sc. 
-        (Hons).</nobr> He now works as consultant through his company, Cadenza New 
-      Zealand Ltd, and also markets Cadenza Drawing Board™, a CAD system he 
-      developed.</p>
-    <p>Mark has been programming in C++ since about 1990, and loves every minute of 
-      it, but is continually amazed at how much more he still has to learn.</p>
-    <p>You can contact Mark at <a href="mailto:mark.rodgers@cadenza.co.nz">mark.rodgers@cadenza.co.nz</a>
-    .
-  </body>
+<head>
+  <meta http-equiv="Content-Language" content="en-us">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+  <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
+  <meta name="ProgId" content="FrontPage.Editor.Document">
+
+  <title>Mark Rodgers</title>
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+  <table border="1" bgcolor="#007F7F" cellpadding="2" summary="">
+    <tr>
+      <td bgcolor="#FFFFFF"><img src="../boost.png" alt=
+      "boost.png (6897 bytes)" width="277" height="86"></td>
+
+      <td><a href="../index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Home</big></font></a></td>
+
+      <td><a href="../libs/libraries.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Libraries</big></font></a></td>
+
+      <td><a href="people.htm"><font face="Arial" color=
+      "#FFFFFF"><big>People</big></font></a></td>
+
+      <td><a href="../more/faq.htm"><font face="Arial" color=
+      "#FFFFFF"><big>FAQ</big></font></a></td>
+
+      <td><a href="../more/index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>More</big></font></a></td>
+    </tr>
+  </table>
+
+  <p><a href=
+  "http://boost.sourceforge.net/photos/mark_rodgers.jpg"><img border="0" src=
+  "http://boost.sourceforge.net/photos/mark_rodgers_small.jpg" alt=
+  "mark_rodgers.jpg (23035 bytes)" align="left" hspace="10" vspace="5" width=
+  "100" height="75"></a>Mark Rodgers lives in <a href=
+  "http://www.wellington.govt.nz/">Wellington</a>, the capital of New
+  Zealand, with his wife, Clare, and their son, Ronnie.</p>
+
+  <p>He studied Computer Science at <a href=
+  "http://www.vuw.ac.nz/home/index.asp">Victoria University of Wellington</a>
+  from 1983 to 1986, completing a B.Sc.&nbsp;(Hons). He now works as
+  consultant through his company, Cadenza New Zealand Ltd, and also markets
+  Cadenza Drawing Board&trade;, a CAD system he developed.</p>
+
+  <p>Mark has been programming in C++ since about 1990, and loves every
+  minute of it, but is continually amazed at how much more he still has to
+  learn.</p>
+
+  <p>You can contact Mark at <a href=
+  "mailto:mark.rodgers@cadenza.co.nz">mark.rodgers@cadenza.co.nz</a>.<br clear="all">
+  </p>
+  <hr>
+
+  <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
+  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  height="31" width="88"></a></p>
+
+  <p>Revised 
+  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->02
+  December, 2006<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
+
+  <p><i>Copyright &copy; 2000 Mark Rodgers</i></p>
+
+  <p><i>Distributed under the Boost Software License, Version 1.0. (See
+  accompanying file <a href="../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy
+  at <a href=
+  "http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</i></p>
+</body>
 </html>

粤ICP备19079148号