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-12-23 02:23:32 -05:00
2017-11-20 23:42:52 -05:00
2008-07-22 11:36:50 +00:00
2017-03-20 10:35:52 -04:00
2017-10-16 14:49:34 +02:00
2008-10-18 15:19:54 +00:00
2017-06-12 13:57:08 -04:00
2008-07-22 11:36:50 +00:00
2011-01-02 00:54:43 +01:00
2008-07-22 11:36:50 +00:00
2017-08-01 00:39:00 -04:00
2016-03-26 12:48:28 +00:00
2015-09-13 16:07:10 -07:00
2009-02-23 18:55:38 +00:00
2018-03-07 23:54:28 +09:00
2017-12-23 02:23:32 -05:00
2016-06-07 20:15:55 +02:00
2017-10-20 10:54:24 +02:00
2016-09-10 02:27:59 +00:00
2017-10-20 10:54:24 +02:00
2017-10-20 10:54:24 +02:00