summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-07-014-63/+93
|\
| * Introduce get_filenames which scans paths for all filenames.Martin Owens2017-07-014-63/+93
* | Merge branch 'speed_up_drawing' of gitlab.com:psychon/inkscapeMarc Jeanmougin2017-07-012-16/+72
|\ \ | |/ |/|
| * SPCanvas::paintSingleBuffer: Draw directly to _backing_storeUli Schlachter2017-07-011-12/+18
| * SPCanvas: Use a similar image for _backing_storeUli Schlachter2017-07-012-4/+51
| * Fix a small memory leak in SPCanvas::paintUli Schlachter2017-07-011-0/+3
* | allows mac os build to fail as we have no mac runners yetMarc Jeanmougin2017-07-011-1/+1
* | Runtime check for primary acceleratorMarc Jeanmougin2017-07-011-5/+11
* | Fix version strings to work on windows & unixsu-v2017-07-012-12/+10
* | Fix a compiling error on debian testingJabier Arraiza2017-07-011-1/+1
|/
* Add Mac CI build configTim Sheridan2017-07-011-6/+35
* Merge branch 'master' of gitlab.com:walterbender/inkscapeMarc Jeanmougin2017-06-301-0/+5418
|\
| * add Munsell palette formated to show hue pagesWalter Bender2017-06-231-0/+5418
| * Revert "add Munsell palette"Walter Bender2017-06-231-3204/+0
| * add Munsell paletteWalter Bender2017-06-231-0/+3204
* | Merge branch 'hacking' of gitlab.com:__chr__/inkscapeMarc Jeanmougin2017-06-303-1/+79
|\ \
| * | jemalloc cmake modulechr[]2017-06-302-0/+75
| * | Replace ImageMagic with GraphicsMagicchr[]2017-06-302-1/+4
* | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-301-35/+73
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:inkscape/inkscapeMartin Owens2017-06-3010-396/+364
| |\ \ \
| * | | | Hackfest: Add start of dropping toolMartin Owens2017-06-301-35/+73
* | | | | Replace cursor-dropping-s.xpmcajhne@gmail.com2017-06-301-1/+1
* | | | | Replace cursor-dropping-s.xpmcajhne@gmail.com2017-06-301-25/+25
* | | | | Replace cursor-dropper-s.xpmcajhne@gmail.com2017-06-301-16/+16
| |/ / / |/| | |
* | | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-306-200/+151
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/inkscape/inkscapeTavmjong Bah2017-06-302-13/+22
| |\ \ \ \
| * | | | | Fix and clean clean some icons.Tavmjong Bah2017-06-306-200/+151
| | |/ / / | |/| | |
* | | | | Use Meta for shortcuts on Mac OSMarc Jeanmougin2017-06-302-183/+191
| |/ / / |/| | |
* | | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-303-11/+89
|\| | |
| * | | Replace cursor-dropper-s.xpm with thicker border for doctormo's real-time col...cajhne@gmail.com2017-06-301-11/+11
| * | | Upload New Filecajhne@gmail.com2017-06-301-0/+39
| * | | Upload New Filecajhne@gmail.com2017-06-301-0/+39
| |/ /
* | | Fix revno with gitMarc Jeanmougin2017-06-302-13/+22
* | | Fix revnoMarc Jeanmougin2017-06-302-12/+12
|/ /
* | Hackfest: Show dropper color in cursor, while moving the mouse.Martin Owens2017-06-304-60/+54
* | Hackfest: Refactor cursors so the hot spot is inside the xpmMartin Owens2017-06-3081-303/+165
* | Merge branch 'master' of gitlab.com:inkscape/inkscapeAlexander Valavanis2017-06-2911-13/+605
|\ \
| * | Filter editor fix for gcc 5Martin Owens2017-06-291-2/+6
| * | Disable "new" filter editorMarc Jeanmougin2017-06-292-2/+1
| * | Merge commit 'd79cc2caf6'Marc Jeanmougin2017-06-294-4/+37
| |\ \
| | * | Allows one to use Super, Hyper and Meta key modifiers in shortcutsMarc Jeanmougin2017-06-294-4/+37
| * | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-2918-115/+92
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-29469-7561/+18311
| |\ \ \ \
| * | | | | glade WIPMarc Jeanmougin2017-06-294-35/+423
| * | | | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-291-1/+1
| |\ \ \ \ \
| * | | | | | First version (non-working)Marc Jeanmougin2017-06-286-9/+177
* | | | | | | aboutbox: Gtk3 fixesAlexander Valavanis2017-06-293-0/+57
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'master' of gitlab.com:inkscape/inkscapeAlexander Valavanis2017-06-292-1/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Add caching to io resources path constructionMartin Owens2017-06-292-1/+8
| | |_|/ / | |/| | |
* | | | | knot-properties: Use Gtk::GridAlexander Valavanis2017-06-292-11/+11