HCoop Git - clinton/prusa3.git/commit

author	Václav 'Ax' Hůla <axtheb@gmail.com>
	Sun, 5 Jan 2014 16:18:44 +0000 (17:18 +0100)
committer	Václav 'Ax' Hůla <axtheb@gmail.com>
	Sun, 5 Jan 2014 16:18:44 +0000 (17:18 +0100)
commit	8ac34a2a68ebe8a501242a740a4f3c419cbf5993
tree	68820d74a9497582171f3049fbfde4a0d55ed035	tree \| snapshot (tar.gz zip)
parent	cfe62670997681c2710f9b4cbef3af3627c459a0	commit \| diff
parent	a74542802fe65b3245d9db9b893ec867060edc46	commit \| diff

Merge branch 'master' of git://github.com/Thav/Prusa3 into Thav-master

Conflicts:
box_frame/sample_stls/default_box_gt2_lm8uu/configuration.scad
box_frame/sample_stls/default_box_htd3_lm8uu/configuration.scad
box_frame/sample_stls/single_plate_htd3_lm8uu/configuration.scad

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

box_frame/configuration.scad.dist	diff1 \|	diff2 \|	blob \| history
box_frame/inc/bearing-guide.scad	diff1 \|	diff2 \|	blob \| history
box_frame/inc/conf_bushing.scad	diff1 \|	diff2 \|	blob \| history
box_frame/inc/functions.scad	diff1 \|	diff2 \|	blob \| history
box_frame/sample_stls/big_htd3_lm12luu/configuration.scad	diff1 \|	diff2 \|	blob \| history
box_frame/sample_stls/default_box_gt2_lm10uu/configuration.scad	diff1 \|	\|	blob \| history
box_frame/sample_stls/single_plate_gt2_lm8uu/configuration.scad	diff1 \|	\|	blob \| history
box_frame/x-carriage.scad	diff1 \|	diff2 \|	blob \| history
box_frame/x-end.scad	diff1 \|	diff2 \|	blob \| history
box_frame/y-belt-holder.scad	diff1 \|	diff2 \|	blob \| history
box_frame/y-drivetrain.scad	diff1 \|	diff2 \|	blob \| history