Merge branch 'xcarriage'
authorVáclav 'Ax' Hůla <axtheb@gmail.com>
Sat, 6 Apr 2013 14:47:47 +0000 (16:47 +0200)
committerVáclav 'Ax' Hůla <axtheb@gmail.com>
Sat, 6 Apr 2013 14:47:47 +0000 (16:47 +0200)
Conflicts:
box_frame/configuration.scad.dist

1  2 
box_frame/inc/functions.scad

Simple merge