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)
commit92fb82be5e27107a75b723d0a0da72d9db629a36
treeb2bd6c89eb53af8b6629abe0df5d93dbf8aa8495
parent0f6ec51a48afcf3b53551be3b54fe416dd63a51b
parente11b3a119dfd66a0c34ca1e4543331e217add4ac
Merge branch 'xcarriage'

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