From 0b8c6f4c8d8baec508743b0ba1b33120bacd009a Mon Sep 17 00:00:00 2001 From: Elmom Date: Sun, 25 Jul 2010 19:59:17 +0300 Subject: [PATCH] Resolved the license mess --- README | 2 +- bearings.scad | 2 ++ motors.scad | 4 +++- nuts_and_bolts.scad | 4 +++- screw.scad | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README b/README index 89b17df..c3d93f5 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ OpenSCAD MCAD Library This library contains components commonly used in designing and moching up mechanical designs. It is currently unfinished and still undergoing considerable API changes however many things are already working. -This library currently has code licensed under the GPL 3.0 and GPL 2.0, please check the files for compatibility. This is to be remedied somehow soon. +This library is licensed under the GPL 2.0. Currently Provided Tools: diff --git a/bearings.scad b/bearings.scad index 0467ae3..e3d02c6 100644 --- a/bearings.scad +++ b/bearings.scad @@ -1,3 +1,5 @@ +// License: GPL 2.0 + //Todo: placeholder; should generate standard + cusom bearing mounting holes module bearing_hole(outer_radius, hole=true, mochup=true) { diff --git a/motors.scad b/motors.scad index 745b1ed..2536ae1 100644 --- a/motors.scad +++ b/motors.scad @@ -1,3 +1,5 @@ +// License: GPL 2.0 + include @@ -89,4 +91,4 @@ module _stepper_motor_mount( } } }; -} \ No newline at end of file +} diff --git a/nuts_and_bolts.scad b/nuts_and_bolts.scad index 4311665..cb74842 100644 --- a/nuts_and_bolts.scad +++ b/nuts_and_bolts.scad @@ -1,3 +1,5 @@ +// License: GPL 2.0 + //testNutsAndBolts(); module testNutsAndBolts() @@ -176,4 +178,4 @@ module boltHole(size, units=MM, length, tolerance = +0.0001, proj = -1) square([capRadius*2, capHeight]); square([radius*2, length]); } -} \ No newline at end of file +} diff --git a/screw.scad b/screw.scad index 8e7dfe8..3a9d4c5 100644 --- a/screw.scad +++ b/screw.scad @@ -1,5 +1,5 @@ // Parametric screw-like things (ball screws, augers) -// It is licensed under the GNU GPL 3.0 license. +// License: GNU GPL 2.0 or later. // © 2010 by Elmo Mäntynen include