Commit Graph

1 Commits

Author SHA1 Message Date
sebastian 3b2061e132 merge branch 'master' of github.com:LongHairedHacker/kaboard
Conflicts:
	kaboard.000
	kaboard.brd
	kaboard.cmp
	kaboard_panelized.000
	kaboard_panelized.brd
	plot/panelized_v1.0/kaboard_panelized-B_Mask.gbs
	plot/panelized_v1.0/kaboard_panelized-B_SilkS.gbo
	plot/panelized_v1.0/kaboard_panelized-F_Mask.gts
	plot/panelized_v1.0/kaboard_panelized-F_SilkS.gto
2013-01-10 19:57:54 +01:00