-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-x64/
-build/
-build-win32/
-bld/
-[Bb]in/
-[Oo]bj/
-# Roslyn cache directories
-*.ide/
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-#NUNIT
-*.VisualState.xml
-TestResult.xml
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-# Chutzpah Test files
-_Chutzpah*
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-# TFS 2012 Local Workspace
-$tf/
-# Guidance Automation Toolkit
-*.gpState
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-# JustCode is a .NET coding addin-in
-.JustCode
-# TeamCity is a build add-in
-_TeamCity*
-# DotCover is a Code Coverage Tool
-*.dotCover
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-# Web workbench (sass)
-.sass-cache/
-# Installshield output folder
-[Ee]xpress/
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-# Click-Once directory
-publish/
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-#*.pubxml
-# NuGet Packages Directory
-packages/*
-## TODO: If the tool you use requires repositories.config
-## uncomment the next line
-#!packages/repositories.config
-# Enable "build/" folder in the NuGet Packages folder since
-# NuGet packages use it for MSBuild targets.
-# This line needs to be after the ignore of the build folder
-# (and the packages folder if the line above has been uncommented)
-!packages/build/
-# Windows Azure Build Output
-csx/
-*.build.csdef
-# Windows Store app package directory
-AppPackages/
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-# RIA/Silverlight projects
-Generated_Code/
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-# SQL Server files
-*.mdf
-*.ldf
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-# Microsoft Fakes
-FakesAssemblies/
-# LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml
-# CMake
-source/build-cmake/*/build/*
-source/build-cmake/*/build-win32/*
-source/src/vm/libcpu_newdev/mame0185/*
+
+!packages/build/
+# (and the packages folder if the line above has been uncommented)
+# Backup & report files from converting an old project file
+# Build Results of an ATL Project
+# Build results
+# Business Intelligence projects
+# CMake
+# Chutzpah Test files
+# Click-Once directory
+# DocProject is a documentation generator add-in
+# DotCover is a Code Coverage Tool
+# Enable "build/" folder in the NuGet Packages folder since
+# Guidance Automation Toolkit
+# Installshield output folder
+# JustCode is a .NET coding addin-in
+# LightSwitch generated files
+# MSTest test Results
+# Microsoft Fakes
+# MightyMoose
+# NCrunch
+# NuGet Packages Directory
+# NuGet packages use it for MSBuild targets.
+# Others
+# Publish Web Output
+# RIA/Silverlight projects
+# ReSharper is a .NET coding add-in
+# Roslyn cache directories
+# SQL Server files
+# TFS 2012 Local Workspace
+# TeamCity is a build add-in
+# This line needs to be after the ignore of the build folder
+# User-specific files
+# Visual C++ cache files
+# Visual Studio profiler
+# Web workbench (sass)
+# Windows Azure Build Output
+# Windows Store app package directory
+# because we have git ;-)
+# to a newer Visual Studio version. Backup files are not needed,
+#!packages/repositories.config
+## Ignore Visual Studio temporary files, build results, and
+## TODO: Comment the next line if you want to checkin your
+## TODO: If the tool you use requires repositories.config
+## files generated by popular Visual Studio add-ons.
+## passwords
+## uncomment the next line
+## web deploy settings but do note that will include unencrypted
+#*.pubxml
+#NUNIT
#gtags
+$tf/
+*.Cache
+*.DotSettings.user
+*.VisualState.xml
+*.[Pp]ublish.xml
+*.[Rr]e[Ss]harper
+*.aps
+*.azurePubxml
+*.bim.layout
+*.bim_*.settings
+*.build.csdef
+*.cachefile
+*.dbmdl
+*.dbproj.schemaview
+*.dotCover
+*.gpState
+*.ide/
+*.ilk
+*.ldf
+*.log
+*.mdf
+*.meta
+*.mm.*
+*.ncb
+*.obj
+*.opensdf
+*.orig
+*.pch
+*.pdb
+*.pfx
+*.pgc
+*.pgd
+*.pidb
+*.psess
+*.publishsettings
+*.rdl.data
+*.rej
+*.rsp
+*.sbr
+*.scc
+*.sdf
+*.sln.docstates
+*.suo
+*.svclog
+*.tlb
+*.tlh
+*.tli
+*.tmp
+*.tmp_proj
+*.user
+*.vsp
+*.vspscc
+*.vspx
+*.vssscc
+*_i.c
+*_i.h
+*_p.c
+*~
+*~
+.*crunch*.local.xml
+.JustCode
+.builds
+.sass-cache/
+/000_20180126_Check_Bug_From_42f93bdbbe8d50833c46509c71016d67ed24c210.diff
+AppPackages/
+AutoTest.Net/
+Backup*/
+ClientBin/
+DocProject/Help/*.HxC
+DocProject/Help/*.HxT
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+DocProject/buildhelp/
+FakesAssemblies/
GPATH
GRTAGS
GSYMS
GTAGS
-
-*~
-*.orig
-*.rej
+GeneratedArtifacts/
+Generated_Code/
+ModelManifest.xml
+TestResult.xml
+UpgradeLog*.XML
+UpgradeLog*.htm
+[Bb]in/
+[Bb]uild[Ll]og.*
+[Dd]ebug/
+[Dd]ebugPS/
+[Dd]ebugPublic/
+[Ee]xpress/
+[Oo]bj/
+[Rr]elease/
+[Rr]eleasePS/
+[Ss]tyle[Cc]op.*
+[Tt]est[Rr]esult*/
+_Chutzpah*
+_NCrunch_*
+_Pvt_Extensions/
+_ReSharper*/
+_TeamCity*
+_UpgradeReport_Files/
+bld/
+build-win32/
+build/
core
+csx/
+dlldata.c
+ipch/
+node_modules/
+packages/*
+publish/
+source/build-cmake/*/build-win32/*
+source/build-cmake/*/build/*
+source/src/vm/libcpu_newdev/mame0185/*
+sql/
+x64/
+~$*
+commit e592e276d8e510ea16c48e723d692761b56bf000
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Fri Mar 2 09:44:43 2018 +0900
+
+ [VM][FM7][DISPLAY] Stop to use OpenMP.Fix display noise at 256k colors mode on Win32 Host.
+ [VM][FM7][DISPLAY] Fix framerate at 400 line mode.
+ [VM][FM77AV40][DISPLAY] Using VARIABLE frame rate.
+ [VM][FM77AV40EX][DISPLAY] Don't scroll at ACTIVE_PAGE != 0.
+
+commit 7aaaad6455fc66b9aed368bff2e500c98d622195
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 15:23:20 2018 +0900
+
+ [UI][Qt][FM16BETA] Initial support.
+
+commit 01de99b7055e0ca4e219c65756dcc56bc555a1a7
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 15:15:02 2018 +0900
+
+ [UI][Qt][FM16Beta] Initial setup.
+
+commit e60a47369dd3890bba921b3e003f4e94cf16a6b1
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 14:57:45 2018 +0900
+
+ [UI][Qt] Fix issues for ROMAJI-TO-KANA conversion.
+
+commit 92b7fefc9e10975aba9c8ffd7036ce4ae7eb0942
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 14:56:52 2018 +0900
+
+ [VM][PYUTA] PYUTA has no state save/load.
+
+commit 2aa68148c5c238cbe53e135b005b12037af68e6f
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 14:56:26 2018 +0900
+
+ [VM][I386][NEWDEV] Fix FTBFS.
+
+commit 07ef5b9ab5e03e3ed330c42419dc2057042cd08b
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 14:55:34 2018 +0900
+
+ [UI][Qt] Track to upstream's updating menus.Still not implement rotate display.
+
+commit ffdfde3c8f0993be201a5a2d83a2d1dbe369776a
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 13:47:21 2018 +0900
+
+ [GENERAL] Merge upstream 2018-03-01.
+
+commit 191f583b4f00d5da9dafe919b51f810653e9d2cd
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 03:38:59 2018 +0900
+
+ [VM][FM7] Framerate should be 55.40fps when 400line (8colors) mode.Add supporting SUPPORT_VARIABLE_TIMING.
+
+commit da9e841a90450c02c7f05cc2857612874d288440
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 00:33:03 2018 +0900
+
+ [UI][Qt] Add option, "Print statistics", related by commit 324b522e8fe7a80d03ac12f9a5800954dc96d900.
+
+commit 943583244db471d733a61828cf3de61207c70996
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 00:32:08 2018 +0900
+
+ [EMU][CONFIG] Add config option print_statistics, related by commit 324b522e8fe7a80d03ac12f9a5800954dc96d900ESC.
+
+commit dfe982069f04ff6eb123d2df5a9995a8467cae69
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 00:31:37 2018 +0900
+
+ .
+
+commit 6f2978a5ea1f16ad235e845aab1fd70ce93b9ad5
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 00:30:27 2018 +0900
+
+ [VM][MB61VH010] Drop unused variables.
+ [VM][MB61VH010][WIP] Adjust sequence of BUSY flag with line.
+
+commit 95f93f2cd448761ac5137ed2a4d291fcb8eb285d
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 00:28:58 2018 +0900
+
+ [VM][FM7] Wait is CPU wait, not MEMORY WAIT.
+ [VM][FM7] Calcurate more correctness wait parameter (with DRAM REFRESH), Thanks to Ryu Takegami.
+
+commit 324b522e8fe7a80d03ac12f9a5800954dc96d900
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date: Thu Mar 1 00:24:43 2018 +0900
+
+ [VM][MC6809] Add SIG_CPU_WAIT_FACTOR. This is setting wait factor (65536 = 1wait per clock, 0 = non wait).This is ugly hack due to not permited to modify clock for CPU#0 by scheduler.
+ See FM7_MAINMEM::setclock() at vm/fm7/fm7_mainmem.cpp for details.
+ [VM][MC6809] Add correcting cpu statistics per 16 frames.
+
commit 5ca21fa5c137ed872baadd8066cc57f104d797da
Author: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Wed Feb 28 04:26:55 2018 +0900
-<B><FONT SIZE=-1>Upstream 2018-02-23<BR>
-Qt Port and FM7 series 2018-02-25 FDC TEST2<BR>
+<B><FONT SIZE=-1>Upstream 2018-03-01<BR>
+Qt Port and FM7 series 2018-03-01 FDC TEST4<BR>
</FONT></B>
<body>
<h1>Common Source Code Project</h1>
<DIV ALIGN=RIGHT><FONT SIZE=2>
-Upstream Version: 2018-02-23<BR>
-Qt Port and FM7 series 2018-02-25 FDC TEST2<BR>
+Upstream Version: 2018-03-01<BR>
+Qt Port and FM7 series 2018-03-01 FDC TEST4<BR>
libCSPavio 2.7.1<BR>
-libCSPgui 2.11.3<BR>
+libCSPgui 2.11.4<BR>
libCSPosd 2.10.2<BR>
libCSPemu_utils 2.7.1<BR>
-libCSPcommon_vm 1.1.28<BR>
+libCSPcommon_vm 1.1.29<BR>
libCSPfmgen 1.1.3<BR>
FFMPEG 3.4 + liblame 3.99 + libx264-152<BR>
-Build Version: <BR>
+Build Version: 7aaaad6455fc66b9aed368bff2e500c98d622195<BR>
</FONT></DIV>
<BR>
<DIV ALIGN=RIGHT><FONT SIZE=3>
OSDN Git Service
