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
..
2014-08-18 22:19:18 +02:00
2014-09-08 00:14:02 +02:00
2014-12-16 10:48:42 -05:00
2018-03-06 09:57:40 +09:00
2018-03-06 09:57:40 +09:00
2014-08-18 22:07:34 +02:00
2014-08-18 22:07:34 +02:00
2014-09-01 00:43:37 -05:00
2014-09-01 00:43:37 -05:00
2018-03-06 09:57:40 +09:00
2014-08-18 22:19:18 +02:00
2018-03-06 09:57:40 +09:00
2017-06-26 19:45:59 +02:00
2015-12-18 21:21:02 +01:00
2009-04-18 01:02:05 +02:00