Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 9a0b9242163d33595329c3decf77b59773b3ae9a 2 parents 069d330 + 33d169e
@chaoticbob chaoticbob authored
Showing with 21 additions and 21 deletions.
  1. +20 −20 docs/welcome/GitSetup.html
  2. 0  docs/welcome/git_images/{mac → mac_images}/mac_build.png
  3. 0  docs/welcome/git_images/{mac → mac_images}/mac_build_thumb.png
  4. 0  docs/welcome/git_images/{mac → mac_images}/step1.png
  5. 0  docs/welcome/git_images/{mac → mac_images}/step1_thumb.png
  6. 0  docs/welcome/git_images/{mac → mac_images}/step2.png
  7. 0  docs/welcome/git_images/{mac → mac_images}/step2_thumb.png
  8. 0  docs/welcome/git_images/{mac → mac_images}/step3.png
  9. 0  docs/welcome/git_images/{mac → mac_images}/step3_thumb.png
  10. 0  docs/welcome/git_images/{mac → mac_images}/step4.png
  11. 0  docs/welcome/git_images/{mac → mac_images}/step4_thumb.png
  12. 0  docs/welcome/git_images/{msw → msw_images}/step1.png
  13. 0  docs/welcome/git_images/{msw → msw_images}/step1_thumb.png
  14. 0  docs/welcome/git_images/{msw → msw_images}/step2.png
  15. 0  docs/welcome/git_images/{msw → msw_images}/step2_thumb.png
  16. 0  docs/welcome/git_images/{msw → msw_images}/step3.png
  17. 0  docs/welcome/git_images/{msw → msw_images}/step3_thumb.png
  18. 0  docs/welcome/git_images/{msw → msw_images}/step4.png
  19. 0  docs/welcome/git_images/{msw → msw_images}/step4_thumb.png
  20. 0  docs/welcome/git_images/{msw → msw_images}/step5.png
  21. 0  docs/welcome/git_images/{msw → msw_images}/step5_thumb.png
  22. +1 −1  tools/packageRelease.py
View
40 docs/welcome/GitSetup.html
@@ -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>
View
0  docs/welcome/git_images/mac/mac_build.png → ...lcome/git_images/mac_images/mac_build.png
File renamed without changes
View
0  ...elcome/git_images/mac/mac_build_thumb.png → ...git_images/mac_images/mac_build_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/mac/step1.png → docs/welcome/git_images/mac_images/step1.png
File renamed without changes
View
0  docs/welcome/git_images/mac/step1_thumb.png → ...ome/git_images/mac_images/step1_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/mac/step2.png → docs/welcome/git_images/mac_images/step2.png
File renamed without changes
View
0  docs/welcome/git_images/mac/step2_thumb.png → ...ome/git_images/mac_images/step2_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/mac/step3.png → docs/welcome/git_images/mac_images/step3.png
File renamed without changes
View
0  docs/welcome/git_images/mac/step3_thumb.png → ...ome/git_images/mac_images/step3_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/mac/step4.png → docs/welcome/git_images/mac_images/step4.png
File renamed without changes
View
0  docs/welcome/git_images/mac/step4_thumb.png → ...ome/git_images/mac_images/step4_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step1.png → docs/welcome/git_images/msw_images/step1.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step1_thumb.png → ...ome/git_images/msw_images/step1_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step2.png → docs/welcome/git_images/msw_images/step2.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step2_thumb.png → ...ome/git_images/msw_images/step2_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step3.png → docs/welcome/git_images/msw_images/step3.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step3_thumb.png → ...ome/git_images/msw_images/step3_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step4.png → docs/welcome/git_images/msw_images/step4.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step4_thumb.png → ...ome/git_images/msw_images/step4_thumb.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step5.png → docs/welcome/git_images/msw_images/step5.png
File renamed without changes
View
0  docs/welcome/git_images/msw/step5_thumb.png → ...ome/git_images/msw_images/step5_thumb.png
File renamed without changes
View
2  tools/packageRelease.py
@@ -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:
Please sign in to comment.
Something went wrong with that request. Please try again.