summaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* update to trunkJabier Arraiza2017-07-01221-4082/+2808
|\
| * Merge branch 'hacking' of gitlab.com:__chr__/inkscapeMarc Jeanmougin2017-06-301-0/+3
| |\
| | * Replace ImageMagic with GraphicsMagicchr[]2017-06-301-0/+3
| * | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-301-35/+73
| |\ \
| | * \ Merge branch 'master' of gitlab.com:inkscape/inkscapeMartin Owens2017-06-301-0/+6
| | |\ \
| | * | | 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
| | |/ / | |/| |
| * | | Use Meta for shortcuts on Mac OSMarc Jeanmougin2017-06-301-0/+6
| |/ /
| * | 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
| |/
| * 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-298-12/+222
| |\
| | * 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-293-4/+36
| | |\
| | | * Allows one to use Super, Hyper and Meta key modifiers in shortcutsMarc Jeanmougin2017-06-293-4/+36
| | * | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-2918-115/+92
| | |\ \
| | * \ \ Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-29101-3207/+1725
| | |\ \ \
| | * | | | glade WIPMarc Jeanmougin2017-06-292-34/+41
| | * | | | 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-291-0/+27
| | |_|_|/ / | |/| | | |
| * | | | | 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
| * | | | Rm remaining imagemenuitem usageAlexander Valavanis2017-06-293-35/+42
| * | | | Use Gtk orientable widgetsAlexander Valavanis2017-06-294-15/+17
| * | | | previewholder: Rm unused (and wrongly constructed) varAlexander Valavanis2017-06-291-1/+0
| * | | | interface: Rm unused functionAlexander Valavanis2017-06-291-29/+0
| * | | | Dock: Rm unnecessary enumAlexander Valavanis2017-06-295-23/+14
| |/ / /
| * | | Hackfest icon work: restore selected menu icons and make theming easierAlexander Valavanis2017-06-29100-3207/+1723
| |\ \ \
| | * | | Remove old icon handling codeAlexander Valavanis2017-06-2992-2114/+498
| | * | | Revert "color wheel: Temp fix for Gtk+ style properties"Alexander Valavanis2017-06-281-30/+0
| | * | | contextmenu: Rm icons per GNOME HIGAlexander Valavanis2017-06-281-19/+1
| | * | | Add a show-icon attribute to menu XMLAlexander Valavanis2017-06-282-25/+48
| | * | | Revert "menu-items: C++ify"Alexander Valavanis2017-06-286-93/+70
| | * | | Revert "Rm unused fn"Alexander Valavanis2017-06-281-0/+29
| | * | | Rm unused fnAlexander Valavanis2017-06-281-29/+0
| | * | | menu-items: C++ifyAlexander Valavanis2017-06-286-70/+93
| | * | | Partial fix for menu items and split contextmenu into separate fileAlexander Valavanis2017-06-278-1081/+1194
| | * | | color wheel: Temp fix for Gtk+ style propertiesAlexander Valavanis2017-06-271-0/+30
| | * | | Initial addition of menu iconsAlexander Valavanis2017-06-271-32/+48
| * | | | Add replacements for themedir for osx and win32Martin Owens2017-06-291-0/+2
| | |_|/ | |/| |
| * | | Improved warning in io/resource.cppMartin Owens2017-06-291-1/+1
| | |/ | |/|
| * | Refactor profile directory use and promote IO::Resource get_path and get_file...Martin Owens2017-06-2823-352/+302
| |/
| * GdkScreen deprecation fixesAlexander Valavanis2017-06-273-17/+78