------------------------------------------------------------------------
r39706 | gerald | 2011-11-01 12:23:36 -0700 (Tue, 01 Nov 2011) | 2 lines
Changed paths:
   M /trunk-1.6/config.nmake
   M /trunk-1.6/configure.in
   M /trunk-1.6/debian/changelog
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/version.conf

1.6.3 → 1.6.4.

------------------------------------------------------------------------
r39727 | gerald | 2011-11-03 14:46:00 -0700 (Thu, 03 Nov 2011) | 14 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/gtk/main_welcome.c

Copy over r38045 from the trunk:

  ------------------------------------------------------------------------
  r38045 | tuexen | 2011-07-15 07:58:45 -0700 (Fri, 15 Jul 2011) | 3 lines
  Changed paths:
     M /trunk/gtk/main_welcome.c

  You can't create a mutex without initializing the thread system.
  So #ifdef the code with USE_THREADS.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r39728 | gerald | 2011-11-03 14:50:29 -0700 (Thu, 03 Nov 2011) | 10 lines
Changed paths:
   M /trunk-1.6/configure.in

Copy over r38046 from the trunk:

  ------------------------------------------------------------------------
  r38046 | tuexen | 2011-07-15 07:59:42 -0700 (Fri, 15 Jul 2011) | 2 lines
  Changed paths:
     M /trunk/configure.in

  Ensure that USE_THREADS is defined when --enable-threads is specified.
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r39742 | gerald | 2011-11-06 07:33:51 -0800 (Sun, 06 Nov 2011) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2011-11-06]
------------------------------------------------------------------------
r39780 | etxrab | 2011-11-09 22:11:04 -0800 (Wed, 09 Nov 2011) | 5 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-capwap.c

From Dirk:
CAPWAP dissector tries to allocate -1 bytes of memory during reassembly.
- changed to return offset.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6555
------------------------------------------------------------------------
r39819 | gerald | 2011-11-13 07:33:51 -0800 (Sun, 13 Nov 2011) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2011-11-13]
------------------------------------------------------------------------
r39914 | gerald | 2011-11-17 12:11:41 -0800 (Thu, 17 Nov 2011) | 2 lines
Changed paths:
   M /trunk-1.6/Makefile.am
   M /trunk-1.6/config.nmake
   M /trunk-1.6/make-version.pl

Copy over recent changes to the versioning environment.

------------------------------------------------------------------------
r39917 | gerald | 2011-11-17 13:52:47 -0800 (Thu, 17 Nov 2011) | 2 lines
Changed paths:
   M /trunk-1.6/make-version.pl

Set the proper version.

------------------------------------------------------------------------
r39919 | gerald | 2011-11-17 14:28:46 -0800 (Thu, 17 Nov 2011) | 2 lines
Changed paths:
   M /trunk-1.6/config.nmake
   M /trunk-1.6/docbook/release-notes.xml

Reset version info.

------------------------------------------------------------------------
r39920 | gerald | 2011-11-17 16:31:47 -0800 (Thu, 17 Nov 2011) | 2 lines
Changed paths:
   M /trunk-1.6/make-version.pl

Don't clobber release information in configure.in.

------------------------------------------------------------------------
r39924 | gerald | 2011-11-17 17:18:35 -0800 (Thu, 17 Nov 2011) | 4 lines
Changed paths:
   M /trunk-1.6/make-version.pl

Maybe it's not a good idea to modify configure.in or config.nmake during
compilation. Add a "--set-svn" option which only affects svnversion.h and
make it the default behavior.

------------------------------------------------------------------------
r39925 | gerald | 2011-11-17 17:35:02 -0800 (Thu, 17 Nov 2011) | 2 lines
Changed paths:
   M /trunk-1.6/make-version.pl

Use the source directory argument.

------------------------------------------------------------------------
r39927 | gerald | 2011-11-17 17:36:07 -0800 (Thu, 17 Nov 2011) | 85 lines
Changed paths:
   M /trunk-1.6/asn1/snmp/packet-snmp-template.c
   M /trunk-1.6/config.nmake
   M /trunk-1.6/configure.in
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-ieee80211.c
   M /trunk-1.6/epan/dissectors/packet-snmp.c
   M /trunk-1.6/epan/dissectors/packet-ucp.c
   M /trunk-1.6/epan/ftypes/ftype-tvbuff.c
   M /trunk-1.6/epan/prefs.c
   M /trunk-1.6/epan/wslua/init_wslua.c
   M /trunk-1.6/epan/wslua/wslua.h
   M /trunk-1.6/epan/wslua/wslua_dumper.c
   M /trunk-1.6/epan/wslua/wslua_proto.c
   M /trunk-1.6/epan/wslua/wslua_tvb.c
   M /trunk-1.6/epan/wslua/wslua_util.c
   M /trunk-1.6/gtk/dfilter_expr_dlg.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r39719 | stig | 2011-11-02 13:06:40 -0700 (Wed, 02 Nov 2011) | 1 line
  Changed paths:
     M /trunk/gtk/dfilter_expr_dlg.c

  Revert revision 39665 (for bug 6472) which introduced bug 6537.
  ------------------------------------------------------------------------
  r39744 | stig | 2011-11-06 09:39:13 -0800 (Sun, 06 Nov 2011) | 6 lines
  Changed paths:
     M /trunk/epan/wslua/init_wslua.c
     M /trunk/epan/wslua/wslua.h
     M /trunk/epan/wslua/wslua_dumper.c
     M /trunk/epan/wslua/wslua_proto.c
     M /trunk/epan/wslua/wslua_tvb.c
     M /trunk/epan/wslua/wslua_util.c

  From Robert G. Jakabosky via bug 5575:
  Fix memory errors in Lua dissectors.
  - Free Tvb when created from ByteArray.
  - Free TvbRange correctly.
  - Free string from get_persconffile_path and get_datafile_path.
  - Some code cleanup.
  ------------------------------------------------------------------------
  r39748 | stig | 2011-11-06 23:41:03 -0800 (Sun, 06 Nov 2011) | 4 lines
  Changed paths:
     M /trunk/epan/wslua/wslua_proto.c

  Do not return from within a TRY/CATCH/ENDTRY because this will make the
  except stack invalid, and will lead to a crash.

  In this case it was when calling a dissector from a table in a Lua script.
  ------------------------------------------------------------------------
  r39777 | guy | 2011-11-09 16:53:48 -0800 (Wed, 09 Nov 2011) | 8 lines
  Changed paths:
     M /trunk/epan/prefs.c

  prefs_reset() has to reset the dissector preferences to their defaults,
  as we don't save to a preferences file preference values that are equal
  to their defaults, so if you change profiles, a preference that has a
  non-default value in the old profile and a default value in the new
  profile, so that it's *not* in the preference file for the new profile,
  will not be set to the right value unless we reset all protocol
  preferences to their defaults first.
  ------------------------------------------------------------------------
  r39831 | guy | 2011-11-14 10:42:11 -0800 (Mon, 14 Nov 2011) | 3 lines
  Changed paths:
     M /trunk/asn1/snmp/packet-snmp-template.c
     M /trunk/epan/dissectors/packet-snmp.c

  Do some more length checking to avoid a dissector bug error.  Should fix
  bug 6564.
  ------------------------------------------------------------------------
  r39834 | cmaynard | 2011-11-14 11:57:45 -0800 (Mon, 14 Nov 2011) | 2 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ucp.c

  The Originator protocol identifier is not present in the "provisioning actions operation -61", only the "session management operatin -60".  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6570.
  ------------------------------------------------------------------------


Copy over by hand:

  ------------------------------------------------------------------------
  r39749 | stig | 2011-11-07 08:09:41 -0800 (Mon, 07 Nov 2011) | 4 lines
  Changed paths:
     M /trunk/epan/ftypes/ftype-tvbuff.c

  Do not return from within a TRY/CATCH/ENDTRY because this will make the
  except stack invalid, and will lead to a crash.

  In this case it was when doing compare functions on a FT_PROTOCOL.
  ------------------------------------------------------------------------
  r39754 | alagoutte | 2011-11-08 06:45:35 -0800 (Tue, 08 Nov 2011) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ieee80211.c

  From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548
  80211 QoS Control: Add Raw TID
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r39928 | gerald | 2011-11-17 19:05:03 -0800 (Thu, 17 Nov 2011) | 2 lines
Changed paths:
   M /trunk-1.6/config.nmake
   M /trunk-1.6/configure.in

Reset release information accidentally checked in with r39927.

------------------------------------------------------------------------
r39939 | gerald | 2011-11-18 08:52:15 -0800 (Fri, 18 Nov 2011) | 2 lines
Changed paths:
   M /trunk-1.6/make-version.pl

Try to preserve native line endings when we rewrite files.

------------------------------------------------------------------------
r39940 | gerald | 2011-11-18 09:46:50 -0800 (Fri, 18 Nov 2011) | 12 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/proto.c

Copy over r39902 from the trunk:

  ------------------------------------------------------------------------
  r39902 | cmaynard | 2011-11-17 07:57:44 -0800 (Thu, 17 Nov 2011) | 2 lines
  Changed paths:
     M /trunk/epan/proto.c

  Fix crash caused by trying to apply a field of type BASE_CUSTOM as a column.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6503.
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
