[librecad] 02/03: Merge tag 'upstream/2.0.0_rc2+nolibs'
Scott Sheridan Howard
showard at alioth.debian.org
Sat Sep 14 02:17:26 UTC 2013
This is an automated email from the git hooks/post-receive script.
showard pushed a commit to branch master
in repository librecad.
commit 9eeb9c8513cf327431ecbbc60d8f4d1377d8e3fc
Merge: 9f758b6 87b58d5
Author: Scott Howard <showard314 at gmail.com>
Date: Fri Sep 13 21:57:25 2013 -0400
Merge tag 'upstream/2.0.0_rc2+nolibs'
Upstream version 2.0.0~rc2+nolibs
Conflicts:
.gitignore
.gitignore | 70 +-
CLEAN.SH | 2 +-
README.md | 83 +-
common.pro => common.pri | 37 +-
libraries/jwwlib/jwwlib.pro | 3 +-
libraries/jwwlib/src/dl_codes.h | 12 +-
libraries/jwwlib/src/dl_jww.h | 8 +-
libraries/jwwlib/src/dl_writer.h | 4 +-
libraries/jwwlib/src/dl_writer_ascii.cpp | 4 +-
libraries/jwwlib/src/jwwdoc.h | 12 +-
libraries/libdxfrw/libdxfrw.pro | 5 +-
libraries/libdxfrw/src/drw_base.h | 207 +-
libraries/libdxfrw/src/drw_entities.cpp | 72 +-
libraries/libdxfrw/src/drw_entities.h | 40 +-
libraries/libdxfrw/src/drw_interface.h | 11 +-
libraries/libdxfrw/src/drw_objects.cpp | 5 +-
libraries/libdxfrw/src/drw_objects.h | 524 ++--
libraries/libdxfrw/src/drw_textcodec.cpp | 12 +
libraries/libdxfrw/src/drw_textcodec.h | 2 +
libraries/libdxfrw/src/dxfreader.cpp | 11 +-
libraries/libdxfrw/src/libdxfrw.cpp | 98 +-
libraries/libdxfrw/src/libdxfrw.h | 13 +-
librecad.dox | 1414 +---------
librecad/res/main/librecad.ico | Bin 7406 -> 7406 bytes
librecad/res/main/librecad16.png | Bin 894 -> 894 bytes
librecad/src/actions/rs_actionblocksinsert.cpp | 6 +-
librecad/src/actions/rs_actionblocksinsert.h | 5 +-
librecad/src/actions/rs_actiondefault.cpp | 6 +-
librecad/src/actions/rs_actiondrawarc.cpp | 2 +-
librecad/src/actions/rs_actiondrawarc3p.cpp | 2 +-
.../src/actions/rs_actiondrawcircletan2_1p.cpp | 5 +-
librecad/src/actions/rs_actiondrawcircletan3.cpp | 13 +-
.../src/actions/rs_actiondrawellipse4points.cpp | 4 +-
.../actions/rs_actiondrawellipsecenter3points.cpp | 5 +-
.../actions/rs_actiondrawellipsecenter3points.h | 10 +-
librecad/src/actions/rs_actiondrawline.cpp | 4 +-
librecad/src/actions/rs_actioninfoangle.cpp | 2 +-
librecad/src/actions/rs_actioninfodist2.cpp | 17 +-
.../src/actions/rs_actionlayerstoggleprint.cpp | 6 +-
librecad/src/actions/rs_actionmodifyrotate.cpp | 4 +-
librecad/src/actions/rs_actionmodifyround.cpp | 7 +-
librecad/src/actions/rs_actionmodifyround.h | 1 +
librecad/src/actions/rs_actionmodifytrim.cpp | 2 +-
.../src/actions/rs_actionpolylineequidistant.cpp | 2 +-
librecad/src/actions/rs_actionpolylinesegment.cpp | 2 +-
.../actions/rs_actiontoolregeneratedimensions.cpp | 2 +-
librecad/src/boost.pri | 155 ++
librecad/src/cmd/rs_commands.h | 1 +
librecad/src/lib/actions/rs_actioninterface.cpp | 2 +-
librecad/src/lib/actions/rs_snapper.cpp | 17 +-
librecad/src/lib/actions/rs_snapper.h | 2 +
librecad/src/lib/creation/rs_creation.cpp | 8 +-
librecad/src/lib/engine/rs.h | 18 +-
librecad/src/lib/engine/rs_arc.cpp | 139 +-
librecad/src/lib/engine/rs_arc.h | 7 +-
librecad/src/lib/engine/rs_blocklist.cpp | 10 +-
librecad/src/lib/engine/rs_blocklist.h | 24 +-
librecad/src/lib/engine/rs_circle.cpp | 60 +-
librecad/src/lib/engine/rs_clipboard.h | 4 +-
librecad/src/lib/engine/rs_constructionline.cpp | 4 +-
librecad/src/lib/engine/rs_constructionline.h | 9 +-
librecad/src/lib/engine/rs_dimaligned.cpp | 12 +-
librecad/src/lib/engine/rs_dimaligned.h | 9 +-
librecad/src/lib/engine/rs_dimangular.cpp | 4 +-
librecad/src/lib/engine/rs_dimangular.h | 13 +-
librecad/src/lib/engine/rs_dimdiametric.cpp | 8 +-
librecad/src/lib/engine/rs_dimdiametric.h | 9 +-
librecad/src/lib/engine/rs_dimension.cpp | 3 +-
librecad/src/lib/engine/rs_dimension.h | 20 +-
librecad/src/lib/engine/rs_dimlinear.cpp | 12 +-
librecad/src/lib/engine/rs_dimlinear.h | 11 +-
librecad/src/lib/engine/rs_dimradial.cpp | 6 +-
librecad/src/lib/engine/rs_dimradial.h | 7 +-
librecad/src/lib/engine/rs_ellipse.cpp | 35 +-
librecad/src/lib/engine/rs_ellipse.h | 4 +
librecad/src/lib/engine/rs_entity.h | 4 +-
librecad/src/lib/engine/rs_entitycontainer.cpp | 29 +-
librecad/src/lib/engine/rs_font.h | 4 +-
librecad/src/lib/engine/rs_fontlist.cpp | 2 +-
librecad/src/lib/engine/rs_graphic.cpp | 3 +
librecad/src/lib/engine/rs_graphic.h | 11 +-
librecad/src/lib/engine/rs_hatch.cpp | 2 +-
librecad/src/lib/engine/rs_layer.cpp | 6 +-
librecad/src/lib/engine/rs_layer.h | 7 +
librecad/src/lib/engine/rs_layerlist.cpp | 32 +-
librecad/src/lib/engine/rs_layerlist.h | 25 +-
librecad/src/lib/engine/rs_layerlistlistener.h | 12 +-
librecad/src/lib/engine/rs_leader.cpp | 1 +
librecad/src/lib/engine/rs_line.cpp | 23 +-
librecad/src/lib/engine/rs_patternlist.cpp | 2 +-
librecad/src/lib/engine/rs_polyline.cpp | 10 +-
librecad/src/lib/engine/rs_solid.cpp | 25 +-
librecad/src/lib/engine/rs_spline.cpp | 3 +-
librecad/src/lib/engine/rs_spline.h | 3 +-
librecad/src/lib/engine/rs_system.cpp | 115 +-
librecad/src/lib/engine/rs_units.cpp | 2 +-
librecad/src/lib/engine/rs_variabledict.cpp | 4 +-
librecad/src/lib/engine/rs_vector.cpp | 12 +-
librecad/src/lib/engine/rs_vector.h | 7 +-
librecad/src/lib/fileio/rs_fileio.cpp | 13 +-
librecad/src/lib/filters/rs_filtercxf.cpp | 8 +-
librecad/src/lib/filters/rs_filterdxf1.cpp | 109 +-
librecad/src/lib/filters/rs_filterdxf1.h | 6 +-
librecad/src/lib/filters/rs_filterdxfrw.cpp | 671 +++--
librecad/src/lib/filters/rs_filterdxfrw.h | 38 +-
librecad/src/lib/filters/rs_filterjww.cpp | 12 +-
librecad/src/lib/filters/rs_filterlff.cpp | 4 +-
librecad/src/lib/gui/rs_graphicview.cpp | 18 +-
librecad/src/lib/gui/rs_graphicview.h | 6 +
librecad/src/lib/gui/rs_painterqt.cpp | 2 +-
librecad/src/lib/information/rs_infoarea.cpp | 2 +-
librecad/src/lib/information/rs_information.cpp | 10 +-
librecad/src/lib/information/rs_locale.h | 8 +
librecad/src/lib/math/lc_quadratic.cpp | 23 +-
librecad/src/lib/math/rs_math.cpp | 64 +-
librecad/src/lib/math/rs_math.h | 4 +-
librecad/src/lib/modification/rs_modification.cpp | 36 +-
librecad/src/lib/modification/rs_selection.cpp | 8 +-
librecad/src/lib/scripting/rs_scriptlist.cpp | 2 +-
librecad/src/main/doc_plugin_interface.cpp | 78 +
librecad/src/main/doc_plugin_interface.h | 11 +
librecad/src/main/emu_qt44.h | 6 +
librecad/src/main/main.cpp | 8 +-
librecad/src/main/qc_applicationwindow.cpp | 76 +-
librecad/src/main/qc_mdiwindow.cpp | 9 +-
librecad/src/muparser.pri | 31 +
librecad/src/plugins/document_interface.h | 77 +-
librecad/src/src.pro | 73 +-
librecad/src/ui/forms/qg_cadtoolbar.cpp | 2 +
librecad/src/ui/forms/qg_cadtoolbarcircles.cpp | 8 +
librecad/src/ui/forms/qg_cadtoolbarcircles.ui | 4 +-
librecad/src/ui/forms/qg_cadtoolbarmodify.cpp | 21 +-
librecad/src/ui/forms/qg_commandwidget.ui | 7 +-
librecad/src/ui/forms/qg_dlghatch.cpp | 23 +-
librecad/src/ui/forms/qg_dlghatch.ui | 16 +
librecad/src/ui/forms/qg_dlgmtext.cpp | 2 +-
librecad/src/ui/forms/qg_dlgtext.cpp | 2 +-
librecad/src/ui/forms/qg_layerdialog.cpp | 4 +-
librecad/src/ui/forms/qg_selectionwidget.cpp | 4 +-
librecad/src/ui/forms/qg_selectionwidget.ui | 12 +-
librecad/src/ui/qg_actionfactory.cpp | 7 +
librecad/src/ui/qg_blockwidget.cpp | 16 +-
librecad/src/ui/qg_blockwidget.h | 2 +-
librecad/src/ui/qg_colorbox.cpp | 10 +-
librecad/src/ui/qg_dialogfactory.cpp | 22 +-
librecad/src/ui/qg_filedialog.cpp | 89 +-
librecad/src/ui/qg_filedialog.h | 3 +
librecad/src/ui/qg_graphicview.cpp | 2 +-
librecad/src/ui/qg_graphicview.h | 2 +-
librecad/src/ui/qg_layerbox.cpp | 2 +-
librecad/src/ui/qg_layerwidget.cpp | 22 +-
librecad/src/ui/qg_layerwidget.h | 8 +-
librecad/src/ui/qg_librarywidget.cpp | 14 +-
librecad/src/ui/qg_pentoolbar.cpp | 6 +-
librecad/support/doc/LibreCADdoc.qhcp | 2 +-
librecad/support/doc/about.txt | 2 +
librecad/support/fonts/iso.lff | 10 +-
librecad/support/fonts/standard.lff | 12 +-
librecad/ts/librecad_ca.ts | 1288 +++++++++-
librecad/ts/librecad_cs.ts | 218 +-
librecad/ts/librecad_da.ts | 218 +-
librecad/ts/librecad_de.ts | 2588 ++++++++++---------
librecad/ts/librecad_el.ts | 639 +++--
librecad/ts/librecad_en.ts | 224 +-
librecad/ts/librecad_en_au.ts | 986 ++++---
librecad/ts/librecad_es.ts | 222 +-
librecad/ts/librecad_es_ar.ts | 218 +-
librecad/ts/librecad_es_bo.ts | 218 +-
librecad/ts/librecad_es_cl.ts | 218 +-
librecad/ts/librecad_es_co.ts | 218 +-
librecad/ts/librecad_es_cr.ts | 218 +-
librecad/ts/librecad_es_do.ts | 218 +-
librecad/ts/librecad_es_ec.ts | 218 +-
librecad/ts/librecad_es_gt.ts | 218 +-
librecad/ts/librecad_es_hn.ts | 218 +-
librecad/ts/librecad_es_mx.ts | 218 +-
librecad/ts/librecad_es_ni.ts | 218 +-
librecad/ts/librecad_es_pa.ts | 218 +-
librecad/ts/librecad_es_pe.ts | 218 +-
librecad/ts/librecad_es_pr.ts | 218 +-
librecad/ts/librecad_es_py.ts | 218 +-
librecad/ts/librecad_es_sv.ts | 218 +-
librecad/ts/librecad_es_us.ts | 218 +-
librecad/ts/librecad_es_uy.ts | 218 +-
librecad/ts/librecad_es_ve.ts | 218 +-
librecad/ts/librecad_et.ts | 218 +-
librecad/ts/librecad_fi.ts | 1329 ++++++----
librecad/ts/librecad_fr.ts | 222 +-
librecad/ts/librecad_hu.ts | 226 +-
librecad/ts/librecad_id_ID.ts | 976 ++++---
librecad/ts/librecad_it.ts | 218 +-
librecad/ts/librecad_ja.ts | 230 +-
librecad/ts/librecad_nl.ts | 220 +-
librecad/ts/librecad_no.ts | 224 +-
librecad/ts/librecad_pa.ts | 226 +-
librecad/ts/librecad_pl.ts | 370 ++-
librecad/ts/librecad_pt_br.ts | 212 +-
librecad/ts/librecad_pt_pt.ts | 212 +-
librecad/ts/librecad_ro_ro.ts | 2687 +++++++++++++++-----
librecad/ts/librecad_ru.ts | 1481 ++++++-----
librecad/ts/librecad_sk.ts | 218 +-
librecad/ts/librecad_sq_al.ts | 972 ++++---
librecad/ts/librecad_sv.ts | 224 +-
librecad/ts/librecad_tr.ts | 218 +-
librecad/ts/librecad_uk.ts | 714 ++++--
librecad/ts/librecad_zh_cn.ts | 1304 ++++++----
librecad/ts/librecad_zh_tw.ts | 986 ++++---
mkspec/freebsd-clang33/qmake.conf | 64 +
mkspec/freebsd-clang33/qplatformdefs.h | 42 +
mkspec/freebsd-g++49/qmake.conf | 64 +
mkspec/freebsd-g++49/qplatformdefs.h | 42 +
plugins/align/align.cpp | 3 +
plugins/align/align.h | 3 +
plugins/align/align.json | 1 +
plugins/align/align.pro | 2 +-
plugins/asciifile/asciifile.cpp | 2 +
plugins/asciifile/asciifile.h | 3 +
plugins/asciifile/asciifile.json | 1 +
plugins/asciifile/asciifile.pro | 2 +-
plugins/importshp/importshp.cpp | 2 +
plugins/importshp/importshp.h | 3 +
plugins/importshp/importshp.json | 1 +
plugins/importshp/importshp.pro | 2 +-
plugins/importshp/shapelib/shpopen.c | 26 +-
plugins/list/list.cpp | 2 +
plugins/list/list.h | 3 +
plugins/list/list.json | 1 +
plugins/list/list.pro | 2 +-
plugins/plugins.pro | 54 +-
plugins/sameprop/sameprop.cpp | 3 +
plugins/sameprop/sameprop.h | 3 +
plugins/sameprop/sameprop.json | 1 +
plugins/sameprop/sameprop.pro | 2 +-
plugins/sample/sample.cpp | 3 +
plugins/sample/sample.h | 3 +
plugins/sample/sample.json | 1 +
plugins/sample/sample.pro | 2 +-
plugins/ts/plugins_ca.ts | 479 ++++
plugins/ts/plugins_cs.ts | 479 ++++
plugins/ts/plugins_da.ts | 479 ++++
plugins/ts/plugins_de.ts | 479 ++++
plugins/ts/plugins_el.ts | 479 ++++
plugins/ts/plugins_en.ts | 479 ++++
plugins/ts/plugins_en_au.ts | 479 ++++
plugins/ts/plugins_es.ts | 479 ++++
plugins/ts/plugins_es_ar.ts | 479 ++++
plugins/ts/plugins_es_bo.ts | 479 ++++
plugins/ts/plugins_es_cl.ts | 479 ++++
plugins/ts/plugins_es_co.ts | 479 ++++
plugins/ts/plugins_es_cr.ts | 479 ++++
plugins/ts/plugins_es_do.ts | 479 ++++
plugins/ts/plugins_es_ec.ts | 479 ++++
plugins/ts/plugins_es_gt.ts | 479 ++++
plugins/ts/plugins_es_hn.ts | 479 ++++
plugins/ts/plugins_es_mx.ts | 479 ++++
plugins/ts/plugins_es_ni.ts | 479 ++++
plugins/ts/plugins_es_pa.ts | 479 ++++
plugins/ts/plugins_es_pe.ts | 479 ++++
plugins/ts/plugins_es_pr.ts | 479 ++++
plugins/ts/plugins_es_py.ts | 479 ++++
plugins/ts/plugins_es_sv.ts | 479 ++++
plugins/ts/plugins_es_us.ts | 479 ++++
plugins/ts/plugins_es_uy.ts | 479 ++++
plugins/ts/plugins_es_ve.ts | 479 ++++
plugins/ts/plugins_et.ts | 479 ++++
plugins/ts/plugins_fi.ts | 479 ++++
plugins/ts/plugins_fr.ts | 479 ++++
plugins/ts/plugins_hu.ts | 479 ++++
plugins/ts/plugins_id_ID.ts | 479 ++++
plugins/ts/plugins_it.ts | 479 ++++
plugins/ts/plugins_ja.ts | 479 ++++
plugins/ts/plugins_nl.ts | 479 ++++
plugins/ts/plugins_no.ts | 479 ++++
plugins/ts/plugins_pa.ts | 479 ++++
plugins/ts/plugins_pl.ts | 479 ++++
plugins/ts/plugins_pt_br.ts | 479 ++++
plugins/ts/plugins_pt_pt.ts | 479 ++++
plugins/ts/plugins_ro_ro.ts | 479 ++++
plugins/ts/plugins_ru.ts | 479 ++++
plugins/ts/plugins_sk.ts | 479 ++++
plugins/ts/plugins_sq_al.ts | 479 ++++
plugins/ts/plugins_sv.ts | 479 ++++
plugins/ts/plugins_tr.ts | 479 ++++
plugins/ts/plugins_uk.ts | 479 ++++
plugins/ts/plugins_zh_cn.ts | 479 ++++
plugins/ts/plugins_zh_tw.ts | 479 ++++
scripts/build-freebsd.sh | 72 +
scripts/build-osx.sh | 18 +
scripts/build-win-setup.bat | 5 +
scripts/build-windows.bat | 8 +
scripts/build-windows.sh | 17 +
scripts/postprocess-osx.sh | 12 +-
scripts/postprocess-unix.sh | 18 +-
scripts/postprocess-win.bat | 25 +-
scripts/postprocess-windows/nsis-4.8.nsi | 3 +-
scripts/postprocess-windows/nsis-5.0.nsi | 174 ++
scripts/set-windows-env.bat | 15 +
settings.pri | 13 +
settings.pro | 10 -
settings_linux.pro | 13 -
settings_macx.pro | 9 -
settings_windows.pro | 20 -
tools/tools.pro | 26 +-
tools/ttf2lff/freetype.pri | 32 +
tools/ttf2lff/lffSize.cpp | 242 --
tools/ttf2lff/lffSize.h | 21 -
tools/ttf2lff/lfftransform.cpp | 645 -----
tools/ttf2lff/main.cpp | 147 +-
tools/ttf2lff/ttf2lff.pro | 65 +-
309 files changed, 44961 insertions(+), 10137 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/librecad.git
More information about the debian-science-commits
mailing list