Merge remote-tracking branch 'origin/master'

This commit is contained in:
Scott Chacon 2011-09-23 16:54:34 -07:00
Родитель 193f3b86ec 697de4fa8d
Коммит fd513b4154
2 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -91,7 +91,7 @@
</td><td>
<div class="center">
<a href="http://www.amazon.com/gp/product/1934356158?ie=UTF8&amp;tag=prgi-20&amp;linkCode=as2&amp;camp=1789&amp;creative=390957&amp;creativeASIN=1934356158"><img class="book" width="120" src="/images/books/pvc_git.gif" alt="" /></a><img src="http://www.assoc-amazon.com/e/ir?t=prgi-20&amp;l=as2&amp;o=1&amp;a=1934356158" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
<a href="http://www.amazon.com/gp/product/1934356158?ie=UTF8&amp;tag=prgi-20&amp;linkCode=as2&amp;camp=1789&amp;creative=390957&amp;creativeASIN=1934356158"><img class="book" width="120" src="/images/books/pvc_git.gif" alt="" /></a><img src="http://www.assoc-amazon.com/e/ir?t=prgi-20&amp;l=as2&amp;o=1&amp;a=1934356158" width="1" height="1" alt="" style="border:none !important; margin:0px !important;" />
<br/>
<a href="http://www.pragprog.com/titles/tsgit/pragmatic-version-control-using-git">Pragmatic Version Control Using Git</a><br/>
by Travis Swicegood
@ -102,7 +102,7 @@
<tr><td>
<div class="center">
<a href="http://www.amazon.com/gp/product/0596520123?ie=UTF8&amp;tag=prgi-20&amp;linkCode=as2&amp;camp=1789&amp;creative=390957&amp;creativeASIN=0596520123"><img class="book" width="120" src="/images/books/vcw_git.jpg" alt="" /></a><img src="http://www.assoc-amazon.com/e/ir?t=prgi-20&amp;l=as2&amp;o=1&amp;a=0596520123" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
<a href="http://www.amazon.com/gp/product/0596520123?ie=UTF8&amp;tag=prgi-20&amp;linkCode=as2&amp;camp=1789&amp;creative=390957&amp;creativeASIN=0596520123"><img class="book" width="120" src="/images/books/vcw_git.jpg" alt="" /></a><img src="http://www.assoc-amazon.com/e/ir?t=prgi-20&amp;l=as2&amp;o=1&amp;a=0596520123" width="1" height="1" alt="" style="border:none !important; margin:0px !important;" />
<br/>
<a href="http://www.amazon.com/Version-Control-Git-collaborative-development/dp/0596520123">Version Control with Git</a><br/>
by Jon Loeliger
@ -122,7 +122,7 @@
<tr><td>
<div class="center">
<a href="http://www.amazon.com/gp/product/1934356727?ie=UTF8&amp;tag=prgi-20&amp;linkCode=as2&amp;camp=1789&amp;creative=390957&amp;creativeASIN=1934356727"><img class="book" width="120" src="/images/books/pg_git.jpg"></a><img src="http://www.assoc-amazon.com/e/ir?t=prgi-20&amp;l=as2&amp;o=1&amp;a=1934356727" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
<a href="http://www.amazon.com/gp/product/1934356727?ie=UTF8&amp;tag=prgi-20&amp;linkCode=as2&amp;camp=1789&amp;creative=390957&amp;creativeASIN=1934356727"><img class="book" width="120" src="/images/books/pg_git.jpg" /></a><img src="http://www.assoc-amazon.com/e/ir?t=prgi-20&amp;l=as2&amp;o=1&amp;a=1934356727" width="1" height="1" alt="" style="border:none !important; margin:0px !important;" />
<br/>
<a href="http://www.pragprog.com/titles/pg_git/pragmatic-guide-to-git">Pragmatic Guide to Git</a><br/>
by Travis Swicegood

Просмотреть файл

@ -1,4 +1,4 @@
<div span="span-21">
<div class="span-21">
<div id="announce">
<strong>The <a href="https://www.survs.com/survey/VCAGZA8CT5">Git User's Survey 2011</a> is up!</strong>
&nbsp;