1. 20 Jun, 2018 5 commits
    • Halla Rempt's avatar
      bump version to · 12c4740e
      Halla Rempt authored
    • Halla Rempt's avatar
      Cleanup the python path setting · 76cb4aab
      Halla Rempt authored
      This puts back the old way of setting the paths. I'm not sure
      whether this will give a build error with python 2; if so, it
      needs to be put between ifdefs, but I'm not sure which ifdefs
      are available. In any case, this block of code is only relevant
      for appimages, and since we're not providing python 2.7 appimages,
      the code would't be executed by 2.7 using krita builds.
      (cherry picked from commit e6568f4a)
    • Halla Rempt's avatar
      Try to make Krita run as an appimage again · adecae18
      Halla Rempt authored
      This reverts part of
      commit 6509644e
      Author: Jeroen Hoolmans <jhoolmans@gmail.com>
      Date:   Wed May 16 15:29:35 2018 +0200
          Added support to compile with Python2.7 on Linux
      The code in this block was never executed because of a wrong
      case-sensitive check for the mount point of an appimage. Now
      it runs, it crashes all the time on *buntu, and sometimes
      on opensuse.
      (cherry picked from commit 410255d0)
    • Halla Rempt's avatar
      Bump versions for 4.1.0 beta 1 · 61326163
      Halla Rempt authored
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) - always resolve ours · ac477f63
      Script Kiddy authored
      In case of conflict in i18n, keep the version of the branch "ours"
      To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
  2. 19 Jun, 2018 6 commits
  3. 18 Jun, 2018 4 commits
  4. 17 Jun, 2018 2 commits
  5. 16 Jun, 2018 11 commits
  6. 15 Jun, 2018 4 commits
  7. 13 Jun, 2018 5 commits
  8. 12 Jun, 2018 3 commits