From 3595c96494c8d65f335b7de1dffb89d1832c955d Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Thu, 7 Jan 2016 23:10:38 +0900 Subject: [PATCH] [DOC] Update docs. --- 000_gitlog.txt | 12 ++++++++++++ RELEASENOTE.txt | 10 ++++++++++ revision.txt | 2 +- source/src/res/credits.html | 6 +++--- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/000_gitlog.txt b/000_gitlog.txt index 8c6e1df76..66f5bfba2 100644 --- a/000_gitlog.txt +++ b/000_gitlog.txt @@ -1,3 +1,15 @@ +commit e0b53fc1bd4af3a232ccc878671bab2caf7743f8 +Author: K.Ohta +Date: Thu Jan 7 23:06:08 2016 +0900 + + [UI][Qt] Fix crash not using USE_CRT_MONITOR_4_3 . + +commit 4aaa41bd55cabee958dfa0e5d8cb610833ee950b +Author: K.Ohta +Date: Thu Jan 7 21:13:10 2016 +0900 + + [DOC] Update Changelog and credits. + commit 204d454b54e87106c29aad9c4f842987a5553aac Author: K.Ohta Date: Thu Jan 7 21:10:09 2016 +0900 diff --git a/RELEASENOTE.txt b/RELEASENOTE.txt index 3d2337e59..7319a0f81 100644 --- a/RELEASENOTE.txt +++ b/RELEASENOTE.txt @@ -83,6 +83,16 @@ http://homepage3.nifty.com/takeda-toshiya/ Changes: *** If you want to know full changes, please read 000_gitlog.txt . *** +* SNAPSHOT Jan 07, 2016 -2 + * MERGE upstream 2015-12-31, with printer emulations. + * A lot of fixes. + * Enable to build with MinGW / Win32. + * FM7: Add aspect ratio 4:3 modes. + * FM7: Add support printer and Dempa shinbum-sha's Joy stick. + * Built with commit e0b53fc1bd4af3a232ccc878671bab2caf7743f8 . + +-- Jan 07, 2016 23:08:35 +0900 K.Ohta + * SNAPSHOT Jan 07, 2016 * MERGE upstream 2015-12-31, with printer emulations. * A lot of fixes. diff --git a/revision.txt b/revision.txt index 41ffbafb2..aafe1ddf9 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -Upstream 20151231
Qt Port and FM7 series 20160107-1
+Upstream 20151231
Qt Port and FM7 series 20160107-2
diff --git a/source/src/res/credits.html b/source/src/res/credits.html index 74194ec76..22046833e 100644 --- a/source/src/res/credits.html +++ b/source/src/res/credits.html @@ -9,8 +9,8 @@

Common Source Code Project

Upstream Version: 2015-12-31
-SNAPSHOT 2016-01-07-1
-Build Version: 204d454b54e87106c29aad9c4f842987a5553aac
+SNAPSHOT 2016-01-07-2
+Build Version: e0b53fc1bd4af3a232ccc878671bab2caf7743f8

Upstream Author:

2006,2015 ©TAKEDA Toshiya
@@ -55,5 +55,5 @@ See also:

-Last modified: Thu 07 Jan, 2016 21:11:42 +Last modified: Thu 07 Jan, 2016 23:09:45 -- 2.11.0