[SCM] Debian packaging for sketch 3D line drawing software branch, master, updated. debian/0.2.183-1-36-ge52fddb
David Bremner
bremner at debian.org
Mon May 21 21:21:34 UTC 2012
The following commit has been merged in the master branch:
commit db1091f9dd383c33299ea213270245f9a356da3c
Merge: 70d57aab74f17f829cd49cee0701b0113ec09d11 2248122acfbc3ea894a27c6bba7624aebe79ce21
Author: David Bremner <bremner at debian.org>
Date: Mon Mar 5 10:06:33 2012 -0400
Merge tag 'upstream/0.3.7'
Many conflicts, possibly because of skipped versions.
Resolved mechanically in favour of upstream.
Conflicts:
Doc/sketch.html
Doc/sketch.info
Doc/sketch.pdf
Doc/sketch/A-hierarchical-model.html
Doc/sketch/A-technical-drawing.html
Doc/sketch/About-sketch.html
Doc/sketch/Affine-arithmetic.html
Doc/sketch/Arithmetic.html
Doc/sketch/Blocks.html
Doc/sketch/Bugs-and-anomalies.html
Doc/sketch/Building-a-drawing.html
Doc/sketch/Camera.html
Doc/sketch/Caveats.html
Doc/sketch/Clipping.html
Doc/sketch/Command-line.html
Doc/sketch/Contributions.html
Doc/sketch/Curves.html
Doc/sketch/Definitions.html
Doc/sketch/Dots-in-TikZ_002fPGF.html
Doc/sketch/Dots.html
Doc/sketch/Drawables.html
Doc/sketch/Drawing-a-solid.html
Doc/sketch/Drawing-options.html
Doc/sketch/Forms-of-definitions.html
Doc/sketch/Forms-of-references.html
Doc/sketch/Frame.html
Doc/sketch/Global-environment.html
Doc/sketch/Global-options.html
Doc/sketch/Hello-world.html
Doc/sketch/Hidden-surface-removal.html
Doc/sketch/Identifiers.html
Doc/sketch/Index-of-syntax.html
Doc/sketch/Input-language.html
Doc/sketch/Installing-sketch.html
Doc/sketch/Internal-options.html
Doc/sketch/Introduction-by-example.html
Doc/sketch/Key-and-reserved-words.html
Doc/sketch/Language-basics.html
Doc/sketch/Language.html
Doc/sketch/Limits-on-error-detection.html
Doc/sketch/Lines.html
Doc/sketch/Literals.html
Doc/sketch/More-to-learn.html
Doc/sketch/Nested-sweeps.html
Doc/sketch/Object-transforms.html
Doc/sketch/Options.html
Doc/sketch/Overview.html
Doc/sketch/PSTricks-options.html
Doc/sketch/Picture-box.html
Doc/sketch/Point-and-vector-literals.html
Doc/sketch/Point-sweeps.html
Doc/sketch/Polygon-sweeps.html
Doc/sketch/Polygons.html
Doc/sketch/Polyline-sweeps-with-closure.html
Doc/sketch/Polyline-sweeps.html
Doc/sketch/Puts.html
Doc/sketch/Repeated-objects.html
Doc/sketch/Repeats.html
Doc/sketch/Reporting-bugs.html
Doc/sketch/Scalar-literals.html
Doc/sketch/Special-objects.html
Doc/sketch/Specials.html
Doc/sketch/Statistics.html
Doc/sketch/Sweep-face-splitting.html
Doc/sketch/Sweeps.html
Doc/sketch/Swept-blocks.html
Doc/sketch/Swept-lines.html
Doc/sketch/Swept-objects.html
Doc/sketch/Swept-points.html
Doc/sketch/Swept-polygons.html
Doc/sketch/TikZ_002fPGF-options.html
Doc/sketch/TikZ_002fPGF-user_002ddefined-styles.html
Doc/sketch/Transform-literals.html
Doc/sketch/Transparency.html
Doc/sketch/Two_002doperand-_0028binary_0029-forms.html
Doc/sketch/Unary-forms.html
Doc/sketch/index.html
Doc/version.texi
expr.c
expr.h
opts.c
updates.htm
version.dat
version.h
y.tab.c
--
Debian packaging for sketch 3D line drawing software
More information about the debian-science-commits
mailing list