OSDN Git Service

[General][CMake] Merge upstream 2016-02-26.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 26 Feb 2016 08:48:17 +0000 (17:48 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 26 Feb 2016 08:48:17 +0000 (17:48 +0900)
commit894b1d23e02f73caea408b17abc992b5280a1ff8
tree6693fd08c0c733b5b99327acfc79b4651b6cbe2b
parent78fee302d68681a719fa379c38c621e9332fed5f
[General][CMake] Merge upstream 2016-02-26.
42 files changed:
doc/ABOUT_eFM7_1.txt [moved from source/ABOUT_eFM7_1.txt with 100% similarity]
doc/FAQ.html [moved from source/FAQ.html with 100% similarity]
doc/FAQ.ja.html [moved from source/FAQ.ja.html with 100% similarity]
doc/ToDo.ja.txt [moved from source/ToDo.ja.txt with 100% similarity]
doc/how2build_qt.ja.txt [moved from source/how2build_qt.ja.txt with 100% similarity]
source/history.txt
source/readme.txt
source/src/emu.cpp
source/src/emu.h
source/src/qt/common/emu_thread.cpp
source/src/qt/common/qt_main.cpp
source/src/res/fp1100.rc
source/src/vm/fp1100/fp1100.h
source/src/vm/fp1100/sub.cpp
source/src/vm/fp1100/sub.h
source/src/vm/hd46505.cpp
source/src/vm/hd46505.h
source/src/vm/jr100/jr100.cpp
source/src/vm/jr100/jr100.h
source/src/vm/jr100/memory.cpp
source/src/vm/mc6840.cpp
source/src/vm/mc6840.h
source/src/vm/mycomz80a/display.cpp
source/src/vm/mycomz80a/display.h
source/src/vm/mycomz80a/mycomz80a.cpp
source/src/vm/mycomz80a/mycomz80a.h
source/src/vm/pasopia/pasopia.h
source/src/vm/pasopia7/pasopia7.h
source/src/vm/sy6522.cpp [moved from source/src/vm/sy6552.cpp with 96% similarity]
source/src/vm/sy6522.h [moved from source/src/vm/sy6552.h with 90% similarity]
source/src/vm/x1/display.cpp
source/src/vm/x1/display.h
source/src/vm/x1/x1.cpp
source/src/vm/x1/x1.h
source/src/vm/ym2203.cpp
source/src/win32/osd.cpp
source/src/win32/osd.h
source/src/win32/osd_input.cpp
source/src/win32/osd_screen.cpp
source/src/win32/osd_video.cpp
source/src/win32/winmain.cpp
source/vc++2008/jr100.vcproj