summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Complete to move to using ui files instead of compiled in xmlMartin Owens2017-06-164-470/+472
| * Cleanup old xmlMartin Owens2017-06-161-55/+4
| * Use user interface files for the user interfaceMartin Owens2017-06-164-5/+92
| * Make tests buildable on windows and account for newer gtest 1.8.0 (which alre...Eduard Braun2017-06-162-41/+30
| |\
| | * Set path to /share folder when running tests (see 2cf0d896e314d46767ec2c0f7e2...Eduard Braun2017-06-161-1/+2
| | * cmake: allow building with gtest 1.8.0 (already includes gmock)Eduard Braun2017-06-162-23/+24
| | * Use CMAKE_RUNTIME_OUTPUT_DIRECTORY instead of the old EXECUTABLE_OUTPUT_PATH ...Eduard Braun2017-06-162-3/+3
| | * Fix compilation on Windows by removing duplicate dependenciesEduard Braun2017-06-151-14/+1
| |/
| * Refactor 1a66c0aae0da7c3b860d06e72f5ff87f444bc462 and allow to use a differen...Eduard Braun2017-06-154-27/+40
| * cleanupEduard Braun2017-06-151-5/+0
| * Improve Windows relocation support.Eduard Braun2017-06-152-59/+12
| * Remove cmake checks for unused libraries.Elliott Sales de Andrade2017-06-151-5/+0
| * Drop x11 dependency.Elliott Sales de Andrade2017-06-152-16/+0
| * Remove unused #cmakedefine's.Elliott Sales de Andrade2017-06-151-73/+0
| * Remove cmake checks for unused sys/ headers.Elliott Sales de Andrade2017-06-152-4/+0
| * Remove cmake checks for C89 headers.Elliott Sales de Andrade2017-06-154-33/+0
| * Remove duplicated build checks.Elliott Sales de Andrade2017-06-156-34/+1
| * Remove checks for unused functions.Elliott Sales de Andrade2017-06-152-8/+0
| * Remove outdated checks for GTK+ functions.Elliott Sales de Andrade2017-06-152-9/+0
| * Merge branch 'master' into docker-ciTed Gould2017-06-153-294/+29
| |\
| | * Remove bzrignore and update gitignoreMartin Owens2017-06-152-294/+6
| | * Ammend Running Without Installing to seperate confMartin Owens2017-06-151-2/+6
| | * Update docs with 'Running Without Installing' instructionsMartin Owens2017-06-151-0/+19
| * | Switching to the official Inkscape repoTed Gould2017-06-151-1/+4
| * | Switching to the Gitlab registryTed Gould2017-06-151-1/+1
| * | Switch to a docker base with the deps in itTed Gould2017-06-141-8/+1
| |/
* | 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
* | Complete to move to using ui files instead of compiled in xmlMartin Owens2017-06-164-470/+472
* | Cleanup old xmlMartin Owens2017-06-151-55/+4
* | Use user interface files for the user interfaceMartin Owens2017-06-154-5/+92
|/
* Merge branch 'master' of gitlab.com:marcjeanmougin/inkscapeMarc Jeanmougin2017-06-141-0/+32
|\
| * Update .gitlab-ci.ymlMarc Jeanmougin2017-06-141-1/+1
| * Update .gitlab-ci.ymlMarc Jeanmougin2017-06-141-1/+1
| * Merge branch 'master' of gitlab.com:marcjeanmougin/inkscapeMarc Jeanmougin2017-06-131-0/+1
| |\
| | * Update .gitlab-ci.ymlMarc Jeanmougin2017-06-131-0/+1
| * | Merge gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-133-10/+8
| |\ \ | | |/ | |/|
| * | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-131-1/+8
| * | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-131-1/+1
| * | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-111-1/+1
| * | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-111-2/+2
| * | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-111-5/+5
| * | Merge gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-1113-768/+976
| |\ \
| * | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-101-2/+12