Merge branch 'master' of github.com:josefprusa/Prusa3
authorVáclav 'Ax' Hůla <axtheb@gmail.com>
Sun, 8 Sep 2013 11:26:25 +0000 (13:26 +0200)
committerVáclav 'Ax' Hůla <axtheb@gmail.com>
Sun, 8 Sep 2013 11:26:25 +0000 (13:26 +0200)
commit389a0c66d72034afcfff79f3d9b2ef989b4279bf
treed6509a588d5cd70433ca5cbb9f339f40b050d86a
parent59ab46d11d732f4f8ff4d85aa8dd2cf4c09a9949
parent1d752a8531562bd97de9e19eb6b4798563c02f56
Merge branch 'master' of github.com:josefprusa/Prusa3

Conflicts:
box_frame/configuration.scad.dist
box_frame/configuration.scad.dist