summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into powerpencilJabier Arraiza2017-11-03447-19038/+22129
|\
| * change assignment to equalitySimon Wells2017-11-021-2/+2
| * fix buildMarc Jeanmougin2017-11-021-1/+1
| * do not build grid2 in target allMarc Jeanmougin2017-11-022-2/+2
| * Make shared library building an optionMarc Jeanmougin2017-11-022-1/+2
| * fix removing class when object to pathAurèle Duda2017-10-311-0/+4
| * fix assertsMarc Jeanmougin2017-10-311-3/+3
| * Fix a bug converting to paths nested LPE with powerstrokeJabier Arraiza2017-10-293-5/+9
| * small fixMarc Jeanmougin2017-10-281-1/+1
| * add some docMarc Jeanmougin2017-10-282-0/+9
| * Merge branch 'master' of gitlab.com:marcjeanmougin/inkscapeMarc Jeanmougin2017-10-280-0/+0
| |\
| | * simpler structure -- compilers and flags have to be given externallyMarc Jeanmougin2017-10-281-0/+0
| * | simpler structure -- compilers and flags have to be given externallyMarc Jeanmougin2017-10-283-17/+6
| |/
| * Merge branch 'master' of https://gitlab.com/inkscape/inkscapeMarc Jeanmougin2017-10-2812-157/+168
| |\
| | * Fix XML text parsing bug.Tavmjong Bah2017-10-281-1/+4
| | * Protect against missing "id".Tavmjong Bah2017-10-271-0/+6
| | * Enable reopening of Prototype dialog on startup.Tavmjong Bah2017-10-272-0/+3
| | * Try to ensure that panels are created with the correct desktop.Tavmjong Bah2017-10-271-0/+6
| | * Remove unused functions.Tavmjong Bah2017-10-262-129/+0
| | * Fix code accidentally made useless in de6d47ed290e02aa4bdc64d6cea5a6c8c20e61c7Eduard Braun2017-10-251-2/+2
| | * Add limited support for CSS 'font-face' rule.Tavmjong Bah2017-10-253-1/+88
| | * Give drawing a reasonable(?) default size if dimensions are in % and there is...Tavmjong Bah2017-10-241-4/+4
| | * UI: Fix canvas scrollbar width a littleEduard Braun2017-10-231-2/+3
| | * Save decl list for 'font-face' rule. Micro-step in supporting rule.Tavmjong Bah2017-10-231-19/+48
| | * Fix regression after r14761: handle size of selected nodes too big and stickyAntonio Ospite2017-10-231-1/+3
| | * Fix compilation on Ubuntu TrustyEduard Braun2017-10-221-1/+4
| * | Trying libFuzzerMarc Jeanmougin2017-10-284-0/+560
| |/
| * Preferences: cleanupEduard Braun2017-10-221-51/+46
| * Preferences: Minor consistency fixes for UIEduard Braun2017-10-221-3/+5
| * Preferences: Simplify code from 9f2c9d85b73ff773e6181d700678f28757714992Eduard Braun2017-10-221-21/+6
| * Preferences: fix inputs not properly expanding horizontallyEduard Braun2017-10-221-1/+1
| * Add preference to load additional fonts from custom directoriesEduard Braun2017-10-213-0/+10
| * Add preferences widget 'PrefMultiEntry'Eduard Braun2017-10-212-0/+43
| * Add preference to load additional fonts from 'fonts' directoriesEduard Braun2017-10-203-1/+22
| * Define INKSCAPE_FONTSDIR and add USER/SYSTEM resource paths for fontsEduard Braun2017-10-204-1/+8
| * FontFactory: Add function to add additional font directoriesEduard Braun2017-10-202-0/+35
| * Merge branch 'smartpointer_refactor' of gitlab.com:jali/inkscapeMarc Jeanmougin2017-10-2058-267/+211
| |\
| | * Refactor Util::ptr_sharedJan Lingscheid2017-10-1844-222/+188
| | * Replace boost::shared_ptrJan Lingscheid2017-10-177-28/+19
| | * Replace boost::scoped_ptrJan Lingscheid2017-10-175-9/+4
| | * Remove std::auto_ptrJan Lingscheid2017-10-172-8/+0
| * | Merge branch 'cleanups' of gitlab.com:stfacc/inkscapeMarc Jeanmougin2017-10-2051-1117/+37
| |\ \
| | * | Drop obsolete wrapper around Glib::file_open_tmpStefano Facchini2017-10-195-38/+13
| | * | Remove all unused makefile.inStefano Facchini2017-10-1925-425/+0
| | * | Remove unused icon-size.hStefano Facchini2017-10-1912-43/+2
| | * | Remove unused util/compose.hppStefano Facchini2017-10-192-394/+0
| | * | Remove unused util/accumulators.hStefano Facchini2017-10-194-127/+0
| | * | Use standard glib macro instead of a custom oneStefano Facchini2017-10-192-4/+2
| | * | Remove a useless conditionalStefano Facchini2017-10-191-24/+19
| | * | Delete dead codeStefano Facchini2017-10-191-15/+1