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
..
2017-10-16 15:09:30 -04:00
2017-10-16 15:09:30 -04:00
2017-10-18 17:33:55 +02:00
2015-08-13 11:37:47 -04:00
2017-02-06 02:41:15 +02:00
2017-10-16 15:09:30 -04:00
2017-10-16 15:09:30 -04:00
2018-03-07 23:54:28 +09:00
2017-10-16 15:09:30 -04:00