summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* jemalloc cmake modulechr[]2017-06-302-0/+75
* Replace ImageMagic with GraphicsMagicchr[]2017-06-302-1/+4
* 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
* | | | 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-29468-7561/+18309
|\ \ \
| * | | Add missing iconAlexander Valavanis2017-06-291-0/+94
| * | | Remove old icon handling codeAlexander Valavanis2017-06-29458-6454/+16976
| * | | 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-283-39/+62
| * | | 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
| |/ |/|
* | Remove menus-bars.xml since it's a duplicate fileMartin Owens2017-06-281-276/+0
* | Fix README for cmake build in placeMartin Owens2017-06-281-1/+1
* | Refactor profile directory use and promote IO::Resource get_path and get_file...Martin Owens2017-06-2823-352/+302
* | Update dxf_input.py for LP Bug #1700582Alvin Penner2017-06-271-2/+2
|/
* GdkScreen deprecation fixesAlexander Valavanis2017-06-275-17/+93
* select-tool: Only stop the rubberband when it was startedUli Schlachter2017-06-261-1/+3
* Merge branch 'ui-files-for-ui-xml'Martin Owens2017-06-239-520/+875
|\
| * Add menus xml in preparation to cleanupMartin Owens2017-06-231-0/+304
| * Merge branch 'ui-files-for-ui-xml' of gitlab.com:inkscape/inkscape into ui-fi...Martin Owens2017-06-2319-605/+105
| |\
| | * Attempt to make paintbucket build option not cause errors for toolbar loadingMartin Owens2017-06-161-0/+11
| | * Fix err leaking and cmakeMartin Owens2017-06-162-1/+3
| | * Make sure CMake can find the new ui filesMartin Owens2017-06-161-1/+1