Merge branch 'master' into curses
authorHolger Lubitz <hal@duncan.ol.sub.de>
Thu, 23 Aug 2007 21:15:54 +0000 (23:15 +0200)
committerHolger Lubitz <hal@duncan.ol.sub.de>
Thu, 23 Aug 2007 21:15:54 +0000 (23:15 +0200)
Conflicts:

src/include/compiler.h
src/include/readline/readline.h

created by strings branch merge. resolved.


Trivial merge