Hyunin Song 0a5d056bdb Merge branch 'stable-1.2' ...

# Conflicts:
        #       .travis/osx..install.sh
        #       .travis/osx..script.sh
        #       cmake/linux/package_linux.sh.in
        #       data/locale/en.ts
        #       src/core/CMakeLists.txt
        #       src/core/ProjectRenderer.cpp
        #       src/gui/FileBrowser.cpp

2018-03-07 23:54:28 +09:00

..

apple

Enable auto-uploading of PRs (#4041)

2017-12-23 02:23:32 -05:00

linux

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00

modules

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00

msys

Don't use temporary gz file for ppa listing

2017-09-07 16:54:41 +09:00

nsis

Disable HiDPI fix for Windows 7 and older

2017-06-12 18:11:56 -04:00

postinstall

Initial Homebrew on OSX Lion patch

2015-08-17 12:39:41 -04:00

scripts

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

build_mingw32.sh

Enable auto-uploading of PRs (#4041)

2017-12-23 02:23:32 -05:00

build_mingw64.sh

Enable auto-uploading of PRs (#4041)

2017-12-23 02:23:32 -05:00

CMakeLists.txt

Implement version major.minor.release-stage.build (#3011)

2016-09-10 02:27:59 +00:00