Merge contents of OPL-TODO into TODO file.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1923

3 files changed, 19 insertions, 22 deletions

diff --git a/Makefile.am b/Makefile.am
index 66cf0983..13e8bddb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,6 @@ EXTRA_DIST=                             \
         CMDLINE                         \
         HACKING                         \
         README.OPL                      \
-        OPL-TODO                        \
         TODO                            \
         BUGS                            \
         rpm.spec
diff --git a/OPL-TODO b/OPL-TODO
deleted file mode 100644
index 6252bc2a..00000000
--- a/OPL-TODO
+++ /dev/null
@@ -1,20 +0,0 @@
-
-opl-branch TODO list
-
-Needs research:
-
- * Strategy when no more voices are available is still wrong
- * Scale levels don't exactly match Vanilla (off-by-one?)
-
-Bad MIDIs:
-
- * doom2.wad MAP01
- * gothicdm MAP05
- * tnt.wad MAP30
- * Alien Vendetta (title screen, MAP01, etc)
-
-Other tasks:
-
- * Get a better software OPL emulator
- * DMXOPTIONS opl3/phase option support.
-
diff --git a/TODO b/TODO
index b0acb8d3..18d7dc67 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 Currently in progress:
 
-* OPL MIDI playback (see: opl-branch)
 * Heretic/Hexen support (see: raven-branch)
 * Strife support (see: strife-branch)
 
@@ -36,3 +35,22 @@ Crazy pie in the sky ideas:
 * DWANGO-like interface for finding players and setting up games.
 * Video capture mode?
 
+== OPL TODO list ==
+
+Needs research:
+
+ * Strategy when no more voices are available is still wrong
+ * Scale levels don't exactly match Vanilla (off-by-one?)
+
+Bad MIDIs:
+
+ * doom2.wad MAP01
+ * gothicdm MAP05
+ * tnt.wad MAP30
+ * Alien Vendetta (title screen, MAP01, etc)
+
+Other tasks:
+
+ * Get a better software OPL emulator
+ * DMXOPTIONS opl3/phase option support.
+