Merge branch 'master' of github.com:josefprusa/Prusa3
authorVáclav 'Ax' Hůla <axtheb@gmail.com>
Tue, 4 Jun 2013 17:49:19 +0000 (19:49 +0200)
committerVáclav 'Ax' Hůla <axtheb@gmail.com>
Tue, 4 Jun 2013 17:49:19 +0000 (19:49 +0200)
commit82bba69021d856432671277a1ea71a3a88184c67
tree151fdf7630a042e4b79c3f87d8948b4a6b4ac6d5
parenta33dd82b8e4a9c671b46420f8599c749cd0594ca
parentba8527643677480202304237a215d275670d2c71
Merge branch 'master' of github.com:josefprusa/Prusa3

Conflicts:
box_frame/doc/dimensions.md
box_frame/extras/gear-small.scad
box_frame/sample_stls/big_htd3_lm12luu/bushing.stl
box_frame/sample_stls/big_htd3_lm12luu/configuration.scad
box_frame/sample_stls/big_htd3_lm12luu/x-carriage.stl
box_frame/sample_stls/big_htd3_lm12luu/x-end.stl
box_frame/sample_stls/big_htd3_lm12luu/y-axis-bracket.stl
box_frame/sample_stls/big_htd3_lm12luu/y-drivetrain.stl
box_frame/x-end.scad