[gerald@xxxxxxxxxxxx]

User: gerald
Date: 2004/10/19 10:59 AM

Log:
 Merge in changes from the trunk.  Adjust some of the preferences and file
 merge code accordingly.

Directory: /branches/win32-native/asn1/cms/
  Changes    Path          Action
  +2 -0      cms.cnf       Modified

Directory: /branches/win32-native/epan/dissectors/
  Changes    Path                      Action
  +2 -1      Makefile.nmake            Modified
  +48 -13    packet-ber.c              Modified
  +2 -2      packet-ber.h              Modified
  +270 -76   packet-bootp.c            Modified
  +85 -79    packet-cms.c              Modified
  +1 -1      packet-cms.h              Modified
  +50 -44    packet-cops.c             Modified
  +1 -1      packet-dcm.c              Modified
  +8 -7      packet-diameter-defs.h    Modified
  +15 -2     packet-diameter.c         Modified
  +21 -2     packet-gprs-llc.c         Modified
  +1 -0      packet-gsm_a.c            Modified
  +23 -46    packet-h235.c             Modified
  +1 -7      packet-h235.h             Modified
  +598 -618  packet-h248.c             Modified
  +532 -156  packet-kerberos.c         Modified
  +2 -2      packet-ns_cert_exts.c     Modified
  +5 -6      packet-per.c              Modified
  +5 -31     packet-pkcs1.c            Modified
  +2 -8      packet-pkcs1.h            Modified
  +6 -6      packet-pkinit.c           Modified
  +1 -1      packet-pkinit.h           Modified
  +2 -2      packet-pkix1explicit.c    Modified
  +1 -1      packet-pkix1explicit.h    Modified
  +6 -6      packet-pkix1implicit.c    Modified
  +1 -1      packet-pkix1implicit.h    Modified
  +2 -0      packet-rtp.c              Modified
  +1 -0      packet-rtp.h              Modified
  +35 -25    packet-sctp.c             Modified
  +402 -315  packet-sip.c              Modified
  +1 -1      packet-smb.c              Modified
  +49 -21    packet-tcap.c             Modified
  +50 -50    packet-x509af.c           Modified
  +1 -1      packet-x509af.h           Modified
  +45 -45    packet-x509ce.c           Modified
  +1 -1      packet-x509ce.h           Modified
  +12 -35    packet-x509if.c           Modified
  +2 -8      packet-x509if.h           Modified
  +4 -30     packet-x509sat.c          Modified
  +2 -8      packet-x509sat.h          Modified

Directory: /branches/win32-native/doc/
  Changes    Path                Action
  +2 -2      Makefile.am         Modified
  +8 -3      Makefile.nmake      Modified
  +8 -0      README.developer    Modified

Directory: /branches/win32-native/docbook/
  Changes    Path          Action
  +12 -7     README.txt    Modified

Directory: /branches/win32-native/docbook/edg_src/
  Changes    Path                         Action
  +6 -1      EDG_chapter_libraries.xml    Modified
  +31 -1     EDG_chapter_sources.xml      Modified
  +13 -1     EDG_chapter_tools.xml        Modified

Directory: /branches/win32-native/epan/
  Changes    Path               Action
  +2 -1      Makefile.nmake     Modified
  +2 -3      column-utils.c     Modified
  +4 -1      libethereal.def    Modified
  +4 -0      prefs-int.h        Modified
  +89 -25    prefs.c            Modified
  +12 -3     prefs.h            Modified
  +246 -152  range.c            Modified
  +21 -9     range.h            Modified
  +2 -0      sigcomp-udvm.c     Modified

Directory: /branches/win32-native/gtk/
  Changes    Path               Action
  +1 -1      capture_dlg.c      Modified
  +199 -12   decode_as_dlg.c    Modified
  +58 -18    file_dlg.c         Modified
  +1 -1      main.c             Modified
  +168 -13   prefs_dlg.c        Modified
  +8 -0      print_dlg.c        Modified
  +23 -0     range_utils.c      Modified
  +8 -0      range_utils.h      Modified
  +11 -0     rtp_analysis.c     Modified

Directory: /branches/win32-native/asn1/h248/
  Changes    Path                      Action
  +38 -38    MEGACO.asn                Modified
  +42 -0     h248.cnf                  Modified
  +93 -5     packet-h248-template.c    Modified

Directory: /branches/win32-native/packaging/nsis/
  Changes    Path              Action
  +8 -2      Makefile.nmake    Modified
  +3 -1      ethereal.nsi      Modified

Directory: /branches/win32-native/plugins/
  Changes    Path                 Action
  +2 -2      Xplugin_table.h      Modified
  +2 -2      plugin_api_list.c    Modified

Directory: /branches/win32-native/tools/
  Changes    Path           Action
  +5 -4      asn2eth.py     Modified
  +0 -0      unix2dos.pl    Added

Directory: /branches/win32-native/xulender/win32-c-sdk/
  Changes    Path                Action
  +12 -8     prefs-dlg.c         Modified
  +5 -3      win32-file-dlg.c    Modified

Directory: /branches/win32-native/
  Changes    Path                      Action
  +16 -12    AUTHORS                   Modified
  +14 -5     Makefile.am               Modified
  +19 -11    Makefile.nmake            Modified
  +35 -19    acinclude.m4              Modified
  +6 -0      config.h.win32            Modified
  +22 -2     config.nmake              Modified
  +6 -6      configure.in              Modified
  +0 -0      make-authors-format.pl    Added
  +25 -12    make-authors-short.pl     Modified
  +0 -108    make-authors-short2.pl    Removed
  +41 -2     manuf                     Modified
  +2 -2      merge.c                   Modified
  +1 -1      merge.h                   Modified
  +29 -5     packet-range.c            Modified
  +7 -3      packet-range.h            Modified
  +0 -0      perlnoutf.pl              Added
  +14 -0     tap-protocolinfo.c        Modified
  +3 -1      xmlstub.c                 Modified
  +10 -4     xmlstub.h                 Modified

Directory: /branches/win32-native/wiretap/
  Changes    Path          Action
  +12 -2     nettl.c       Modified
  +1 -0      nettl.h       Modified
  +2 -2      netxray.c     Modified

Directory: /branches/win32-native/asn1/x509af/
  Changes    Path          Action
  +3 -1      x509af.cnf    Modified



http://anonsvn.ethereal.com/viewcvs/viewcvs.py?rev=12346&view=rev