Skip to content

Commit 44719cc

Browse files
committed
Merge branch 'master' of github.com:cpp-netlib/cpp-netlib.github.com
Conflicts: index.html
2 parents 9d03733 + ca248f8 commit 44719cc

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

‎index.html

+7-9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h1>The C++ Network Library Project</h1>
2929
<p class="lead">A collection of open-source libraries for high level network programming.</p>
3030
</header>
3131
<div class="row">
32-
<div class="col-md-3" id="cpp-netlib-docs-sidebar" role="complimentary" >
32+
<div class="col-md-3" id="cpp-netlib-docs-sidebar" role="complimentary">
3333
<ul class="nav list-group cpp-netlib-sidebar" data-spy="affix" data-offset-top="245">
3434
<li class="list-group-item"><a href="#overview">Overview</a></li>
3535
<li class="list-group-item"><a href="#download">Download</a></li>
@@ -66,27 +66,25 @@ <h1>Download</h1>
6666
<div class="col-md-4">
6767
<a
6868
href="http://commondatastorage.googleapis.com/cpp-netlib-downloads/0.11.0/cpp-netlib-0.11.0.zip"
69-
class="btn btn-primary btn-lg btn-block">0.11.0 (zip)<br>
69+
class="btn btn-primary btn-lg btn-block">0.11.0 (zip)</a>
70+
<br>
7071
<small class="text-muted cpp-netlib-hash">md5: 7d08b5738970b9549a75ec98ee4986be</small>
71-
</a>
7272
</div>
7373
<div class="col-md-4">
7474
<a
7575
href="http://commondatastorage.googleapis.com/cpp-netlib-downloads/0.11.0/cpp-netlib-0.11.0.tar.gz"
76-
class="btn btn-primary btn-lg btn-block">0.11.0 (tar.gz)<br>
76+
class="btn btn-primary btn-lg btn-block">0.11.0 (tar.gz)</a>
77+
<br>
7778
<small class="text-muted cpp-netlib-hash">md5: 6fba4f2f64f19af9f172fd60ad8e76ab</small>
78-
</a>
7979
</div>
8080
<div class="col-md-4">
8181
<a
8282
href="http://commondatastorage.googleapis.com/cpp-netlib-downloads/0.11.0/cpp-netlib-0.11.0.tar.bz2"
83-
class="btn btn-primary btn-lg btn-block">0.11.0 (tar.bz2)<br>
83+
class="btn btn-primary btn-lg btn-block">0.11.0 (tar.bz2)</a>
84+
<br>
8485
<small class="text-muted cpp-netlib-hash">md5: 0765cf203f451394df98e6ddf7bf2541</small>
85-
</a>
8686
</div>
8787
</div>
88-
<p>You can download <a href="https://github.com/cpp-netlib/cpp-netlib/downloads">previous releases</a> of the library from our
89-
Github download page.</p>
9088
</section>
9189
<section id="documentation">
9290
<div class="page-header">

‎process.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ <h2>Preparing a PR</h2>
123123
date.</strong> To do this you should first pull changes to your
124124
local master (assuming that's where you'd like to send a pull
125125
request to), rebase your integration branch to the tip of master,
126-
then make sure all merge conflicts are dealt with. Proceed ony
126+
then make sure all merge conflicts are dealt with. Proceed only
127127
when your integration branch is up-to-date with the official
128128
branch you're going to send your PR to.</li>
129129
<li><strong>Send the PR.</strong> Once you're reasonably happy

‎static/cpp-netlib.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ html, body { padding-top: 20px; }
99
#push, #footer { height: 80px;}
1010
#footer { background-color: #f5f5f5; }
1111
.credit { text-align: center; }
12-
.cpp-netlib-hash { font-size: 11px; }
12+
.cpp-netlib-hash { font-size: 11px; text-align: center; }
1313
.list-group-item a:link {color: black; }
1414
.list-group-item a:visited {color: black; }
1515
.list-group-item a:hover {color: black; }

0 commit comments

Comments
 (0)