Merge branch 'master' into crtc

Conflicts:
	src/main/java/com/loomcom/symon/Simulator.java
	src/main/java/com/loomcom/symon/devices/Device.java
	src/main/java/com/loomcom/symon/devices/Memory.java
This commit is contained in:
Seth Morabito committed 2013-12-28 23:35:22 -08:00
commit 070e9db813
10 files changed
+51 -66

No files matched your search

+5 -3
View File
@@ -3,11 +3,11 @@ SYMON - A 6502 System Simulator
**NOTE: THIS SOFTWARE IS UNDER ACTIVE DEVELOPMENT. Feedback is welcome!**
**Version:** 0.8.5
**Version:** 0.9.0
**Last Updated:** 30 March, 2013
**Last Updated:** 29 December, 2013
Copyright (c) 2008-2013 Seth J. Morabito <web@loomcom.com>
Copyright (c) 2013 Seth J. Morabito <web@loomcom.com>
See the file COPYING for license.
@@ -139,6 +139,8 @@ running.
## 5.0 Revision History
- **0.9.0:** 29 December, 2013 - First pass at a 6545 CRTC simulation.
- **0.8.5:** 30 March, 2013 - ASCII display for memory window.
Allows user to select a step count from a drop-down box.