Skip to content

Commit 25e5d38

Browse files
committed
Add merged changes
1 parent 55d20c7 commit 25e5d38

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646

4747
- EmuGUI now utilises the Win32 API on Windows. This is to fix an issue where EmuGUI is not able to determine the Documents folder properly.
4848
- The changes from 2.0.9 have been added to the changelog.
49+
- The logs now tell you if your system is unsupported.
50+
- In the "About" section, you will read a message about this thing (now also for RAM).
51+
- You will find the updated requirements in the readme.
52+
- Formatting fixed
4953

5054
## Known issues
5155

emugui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def __init__(self, parent=None):
132132
logman = errors.logman.LogMan()
133133
logman.generateLogID()
134134
logman.logFile = logman.setLogFile()
135-
self.version = "2.1.0.57ab_dev"
135+
self.version = "2.1.0.5703_dev"
136136

137137
self.architectures = [
138138
["i386", self.lineEdit_4],

0 commit comments

Comments
 (0)