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)
commit5d6f6fb9243aca7f62f85919519a584836302c99
tree26a81eeaf56272b45d6c58c12999151abc3bbd84
parent2e88138b0687f2237a839cff130ceeb74ff40d0e
parent376bacab6775b2f579db9e6143a628f7c960efb5
Merge branch 'master' into curses

Conflicts:

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

created by strings branch merge. resolved.