$Id: merging,v 1.1 1999/10/25 08:04:15 christof Exp $

merging foo.cc/foo.hh and foo.cc_glade foo.hh_glade:

add all classes not contained within old files,
add all methods not contained within old files (configurable !!! or ask)