Merge branch 'development' into test

pull/20/head
Carlos Garcia Saura 2014-01-23 12:04:14 +01:00
commit 3e41e6b8be
3 changed files with 10 additions and 6 deletions

View File

@ -17,8 +17,8 @@ News
Render (v0.9.7)
--
![ScreenShot](https://github.com/carlosgs/Cyclone-PCB-Factory/raw/master/Media/Cyclone_render_v0.9.7_full.png)
![ScreenShot](https://github.com/carlosgs/Cyclone-PCB-Factory/raw/master/Media/Cyclone_render_v0.9.7_full_explodedView.png)
![ScreenShot](../Media/Cyclone_render_v0.9.7_full.png)
![ScreenShot](../Media/Cyclone_render_v0.9.7_full_explodedView.png)
**Thanks a lot to Glen Chung for the fully assembled renders**
Notes

View File

@ -1,7 +1,7 @@
CNC_ShieldBoX
===========================
This is a 3D printable box created to house an Arduino Uno form factor and a CNC Shield.
![ScreenShot](https://github.com/yOPERO/CNC_shieldBox/blob/master/Pictures/printedSmall.gif?raw=true)
![ScreenShot](Pictures/printedSmall.gif)
Status
--

View File

@ -3,7 +3,7 @@ Cyclone-PCB-Factory v0.9.7
The first 3D-printable (Rep-Rap alike) CNC machine, intended for PCB manufacture.
![ScreenShot](https://github.com/carlosgs/Cyclone-PCB-Factory/raw/master/Media/Cyclone_built_v0.9.7.jpg)
![ScreenShot](Media/Cyclone_built_v0.9.7.jpg)
Mail list / Forum
--
@ -15,6 +15,10 @@ Wiki entry on RepRap.org
--
<http://reprap.org/wiki/Cyclone_PCB_Factory>
Must read: Progress and current status of the Cyclone proyect
--
<http://carlosgs.es/node/47>
Bill of materials
--
_Work in progress_
@ -73,8 +77,8 @@ _Check Hardware, Software and Firmware sections for details regarding authorship
Render (v0.9.7)
--
![ScreenShot](https://github.com/carlosgs/Cyclone-PCB-Factory/raw/master/Media/Cyclone_render_v0.9.7_full.png)
![ScreenShot](https://github.com/carlosgs/Cyclone-PCB-Factory/raw/master/Media/Cyclone_render_v0.9.7_full_explodedView.png)
![ScreenShot](Media/Cyclone_render_v0.9.7_full.png)
![ScreenShot](Media/Cyclone_render_v0.9.7_full_explodedView.png)
**Thanks a lot to Glen Chung for the fully assembled renders**
Disclaimer