Fix compile errors on Suse 9.1:
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 18 Jun 2004 12:04:49 +0000 (12:04 +0000)
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 18 Jun 2004 12:04:49 +0000 (12:04 +0000)
commit9e21ab29a6dd651499a07996a41ddf1c5aebc876
treeb6339528f4eeb7fffde06fcb57a32be2f73887bc
parent27a28bca2351b290bf612a7d93984b6ee69f8060
Fix compile errors on Suse 9.1:
- It's gboolean not boolean
Fix warning about extraneous , at end of enum.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11177 f5534014-38df-0310-8fa8-9805f1628bb7
merge.c
merge.h