HCoop / clinton / prusa3.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4edfdf2 0ae9e1f)
Merge branch 'master' of github.com:josefprusa/Prusa3
authorVáclav 'Ax' Hůla <axtheb@gmail.com>
Tue, 14 May 2013 07:59:00 +0000 (09:59 +0200)
committerVáclav 'Ax' Hůla <axtheb@gmail.com>
Tue, 14 May 2013 07:59:00 +0000 (09:59 +0200)
1  2 
box_frame/configuration.scad.dist patch | diff1 | diff2 | blob | history
box_frame/inc/functions.scad patch | diff1 | diff2 | blob | history
box_frame/x-carriage.scad patch | diff1 | diff2 | blob | history

diff --cc box_frame/configuration.scad.dist
Simple merge
diff --cc box_frame/inc/functions.scad
Simple merge
diff --cc box_frame/x-carriage.scad
Simple merge
Unnamed repository; edit this file 'description' to name the repository.