Permalink
Browse files

Merge branch 'master' of github.com:cinder/Cinder

  • Loading branch information...
2 parents 069d330 + 33d169e commit 9a0b9242163d33595329c3decf77b59773b3ae9a @chaoticbob chaoticbob committed Oct 14, 2010
@@ -53,14 +53,14 @@
<br /><br />
<center>
<div id="macgit_image">
- <a href="git_images/mac/step1.png" title="Download the latest Git installer from its Google code page.">
- <img src="git_images/mac/step1_thumb.png" /></a>
- <a href="git_images/mac/step2.png" title="The default installer options are good choices.">
- <img src="git_images/mac/step2_thumb.png" /></a>
- <a href="git_images/mac/step3.png" title="Cinder's home on Github provides a path for checking out the repository, <code>git://github.com/cinder/Cinder.git</code>">
- <img src="git_images/mac/step3_thumb.png" /></a>
- <a href="git_images/mac/step4.png" title="After launching Terminal, execute the command<br /> <code>git clone git://github.com/cinder/Cinder.git cinder_master</code>">
- <img src="git_images/mac/step4_thumb.png" /></a>
+ <a href="git_images/mac_images/step1.png" title="Download the latest Git installer from its Google code page.">
+ <img src="git_images/mac_images/step1_thumb.png" /></a>
+ <a href="git_images/mac_images/step2.png" title="The default installer options are good choices.">
+ <img src="git_images/mac_images/step2_thumb.png" /></a>
+ <a href="git_images/mac_images/step3.png" title="Cinder's home on Github provides a path for checking out the repository, <code>git://github.com/cinder/Cinder.git</code>">
+ <img src="git_images/mac_images/step3_thumb.png" /></a>
+ <a href="git_images/mac_images/step4.png" title="After launching Terminal, execute the command<br /> <code>git clone git://github.com/cinder/Cinder.git cinder_master</code>">
+ <img src="git_images/mac_images/step4_thumb.png" /></a>
</div>
</center>
<br />
@@ -76,16 +76,16 @@
<br /><br />
<center>
<div id="mswgit_image">
- <a href="git_images/msw/step1.png" title="Download the latest Git installer from its Google code page.">
- <img src="git_images/msw/step1_thumb.png" /></a>
- <a href="git_images/msw/step2.png" title="When prompted about <em>Adjusting your PATH environment</em> we recommend you select <em>Use Git Bash only</em>.">
- <img src="git_images/msw/step2_thumb.png" /></a>
- <a href="git_images/msw/step3.png" title="When prompted about <em>Configuring line ending conversions</em> we recommend you select <em>Checkut windows-style, commit Unix-style</em>.">
- <img src="git_images/msw/step3_thumb.png" /></a>
- <a href="git_images/msw/step4.png" title="Cinder's home on Github provides a path for checking out the repository, <code>git://github.com/cinder/Cinder.git</code>">
- <img src="git_images/msw/step4_thumb.png" /></a>
- <a href="git_images/msw/step5.png" title="After launching Git Bash, execute the command<br /> <code>git clone git://github.com/cinder/Cinder.git cinder_master</code>">
- <img src="git_images/msw/step5_thumb.png" /></a>
+ <a href="git_images/msw_images/step1.png" title="Download the latest Git installer from its Google code page.">
+ <img src="git_images/msw_images/step1_thumb.png" /></a>
+ <a href="git_images/msw_images/step2.png" title="When prompted about <em>Adjusting your PATH environment</em> we recommend you select <em>Use Git Bash only</em>.">
+ <img src="git_images/msw_images/step2_thumb.png" /></a>
+ <a href="git_images/msw_images/step3.png" title="When prompted about <em>Configuring line ending conversions</em> we recommend you select <em>Checkut windows-style, commit Unix-style</em>.">
+ <img src="git_images/msw_images/step3_thumb.png" /></a>
+ <a href="git_images/msw_images/step4.png" title="Cinder's home on Github provides a path for checking out the repository, <code>git://github.com/cinder/Cinder.git</code>">
+ <img src="git_images/msw_images/step4_thumb.png" /></a>
+ <a href="git_images/msw_images/step5.png" title="After launching Git Bash, execute the command<br /> <code>git clone git://github.com/cinder/Cinder.git cinder_master</code>">
+ <img src="git_images/msw_images/step5_thumb.png" /></a>
</div>
</center>
<br />
@@ -105,8 +105,8 @@
<br />
<center>
<div id="macbuild_image">
- <a href="git_images/mac/mac_build.png" title="Run the script <code>xcode/fullbuild.sh</code> and go make some coffee.">
- <img src="git_images/mac/mac_build_thumb.png" /></a>
+ <a href="git_images/mac_images/mac_build.png" title="Run the script <code>xcode/fullbuild.sh</code> and go make some coffee.">
+ <img src="git_images/mac_images/mac_build_thumb.png" /></a>
</div>
</center>
<br>
@@ -60,7 +60,7 @@ def processExport( outputName, compilerName, version ):
shutil.rmtree( outputDir + "test" )
print "copying boost headers"
shutil.copytree( baseDir + os.sep + "boost" + os.sep + "boost", outputDir + "boost" + os.sep + "boost" )
- return outputDir
+ return outputDir
if len(sys.argv) != 3:

0 comments on commit 9a0b924

Please sign in to comment.