Fix merge of a4e2b9adbba95c2d783761e84444bbb3c8d6107b.

The manual merge of a4e2b9ad that I did resulted in previous commits
(c7be281b and 20fcf9b) being undone.  Fix that up.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
1 file changed
tree: 4604ddb3cabcc1ee984af6111271ff77f41d196e
  1. .gitignore
  2. COPYING
  3. COPYING.LESSER
  4. Makefile
  5. README
  6. TODO
  7. src/
  8. tools/
  9. vgasrc/