lp:~meberl/inkscape/extension-system

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~inkscape.dev/inkscape/trunk at revision 14855

Mc: Approve on 2016-04-16

Diff: 1016 lines (+660/-31)

23 files modified

CMakeLists.txt (+3/-0)
CMakeScripts/ConfigChecks.cmake (+2/-1)
CMakeScripts/DefineDependsandFlags.cmake (+70/-3)
build-x64.xml (+4/-0)
build.xml (+4/-0)
configure.ac (+1/-0)
configure.bat (+9/-0)
po/CMakeLists.txt (+3/-0)
src/CMakeLists.txt (+19/-12)
src/extension/CMakeLists.txt (+4/-0)
src/extension/Makefile_insert (+2/-0)
src/extension/dependency.cpp (+12/-0)
src/extension/dependency.h (+1/-0)
src/extension/loader.cpp (+137/-0)
src/extension/loader.h (+73/-0)
src/extension/plugins/CMakeLists.txt (+1/-0)
src/extension/plugins/grid2/CMakeLists.txt (+8/-0)
src/extension/plugins/grid2/grid.cpp (+220/-0)
src/extension/plugins/grid2/grid.h (+58/-0)
src/extension/plugins/grid2/libgrid2.inx (+20/-0)
src/extension/system.cpp (+7/-8)
src/io/inkjar.h (+1/-7)
touch.bat (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

14774. By Moritz Eberl <email address hidden> on 2016-04-16

removed unnecessary comments

14773. By Moritz Eberl <email address hidden> on 2016-04-16

Merge

14772. By Moritz Eberl <email address hidden> on 2016-04-16

merge and fixed build

14771. By Moritz Eberl <email address hidden> on 2016-04-16

Added Sebastian Faubels helper scripts for windows.

14770. By Moritz Eberl <email address hidden> on 2016-04-16

Added missing file

14769. By Moritz Eberl <email address hidden> on 2016-04-16

Added an example plugin.

14768. By Moritz Eberl <email address hidden> on 2016-04-16

Added Sebastian Faubels CMake changes for the windows build.

14767. By Moritz Eberl <email address hidden> on 2016-04-16

CMake build creates a shared libinkscape_base library and links inkscape and inkview against it.

14766. By Moritz Eberl <email address hidden> on 2016-04-13

Merge and fixed CMake build

14765. By Moritz Eberl <email address hidden> on 2016-04-13

Merge