summaryrefslogtreecommitdiff
path: root/Wunschliste/3D-Drucker/index.mdwn
diff options
context:
space:
mode:
authorPhilipp Wollschlegel <folken@kabelsalat.ch>2013-12-16 21:38:50 +0100
committerPhilipp Wollschlegel <folken@kabelsalat.ch>2013-12-16 21:38:50 +0100
commit50f465d9ffa9afe4cb40615e0425980adc9a1b42 (patch)
tree9b2f8bdcff9adbc7e4632ae4e08700950d033006 /Wunschliste/3D-Drucker/index.mdwn
parent1ad93d874fc3bd97abc077ade91ae9e2c0f40cb8 (diff)
parente5b1dfe9420c5ec1d6a36261004ba669144b5195 (diff)
Merge branch 'master' of git+ssh://www-static.zrh.internetputzen.com/home/www/wiki.starship-factory.ch/wiki
Conflicts: index.mdwn
Diffstat (limited to 'Wunschliste/3D-Drucker/index.mdwn')
-rw-r--r--Wunschliste/3D-Drucker/index.mdwn10
1 files changed, 0 insertions, 10 deletions
diff --git a/Wunschliste/3D-Drucker/index.mdwn b/Wunschliste/3D-Drucker/index.mdwn
deleted file mode 100644
index 0487b7ff..00000000
--- a/Wunschliste/3D-Drucker/index.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-Vorhanden:
-
-* Reprap Pro Huxley (im Moment im RAIF HQ Muttenz)
-* Material: 8kg Plastik in 4 verschiedenen Farben (4kg ABS + 4kg PLA)
-* Benötigt: Preisliste
-
-Onlineressourcen:
-
-* <http://www.thingiverse.com/> 3D-Modelle herunterladen
-* <http://cloud.netfabb.com/> stl-Modelle korrigieren lassen