------------------------------------------------------------------------
r31630 | gerald | 2010-01-22 16:38:17 -0800 (Fri, 22 Jan 2010) | 2 lines
Changed paths:
   M /trunk-1.0/Makefile.nmake
   M /trunk-1.0/config.nmake
   M /trunk-1.0/tools/win32-setup.sh

Use GNUTLS 2.8.5-2.

------------------------------------------------------------------------
r31642 | gerald | 2010-01-24 08:04:20 -0800 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-01-24]
------------------------------------------------------------------------
r31671 | gerald | 2010-01-25 14:50:55 -0800 (Mon, 25 Jan 2010) | 78 lines
Changed paths:
   M /trunk-1.0/doc/README.developer
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/docbook/wsug_src/WSUG_app_tools.xml
   M /trunk-1.0/epan/dissectors/packet-kerberos.c
   M /trunk-1.0/epan/dissectors/packet-smb.c
   M /trunk-1.0/epan/dissectors/packet-smb2.c
   M /trunk-1.0/epan/libwireshark.def
   M /trunk-1.0/epan/proto.c
   M /trunk-1.0/plugins/infiniband/packet-infiniband.c
   M /trunk-1.0/plugins/lwres/packet-lwres.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r31187 | stig | 2009-12-07 07:07:38 -0800 (Mon, 07 Dec 2009) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-smb.c
   M /trunk/epan/dissectors/packet-smb2.c

A fix for bug 4301:
Check sip->extra_info for SMB_EI_NTI before usage.
------------------------------------------------------------------------
r31615 | guy | 2010-01-21 20:43:07 -0800 (Thu, 21 Jan 2010) | 5 lines
Changed paths:
   M /trunk/docbook/wsug_src/WSUG_app_tools.xml

Clarify tcpdump's default snapshot length a bit - and recommend 65535 as
the argument to "-s" (1500 is too small even for Ethernet, as the
maximum size of packets on Ethernet is 1514 bytes if you don't count the
FCS and 1518 bytes if you do).
------------------------------------------------------------------------



Copy over with manual intervention:

------------------------------------------------------------------------
r28712 | morriss | 2009-06-12 07:32:32 -0700 (Fri, 12 Jun 2009) | 3 lines
Changed paths:
   M /trunk/epan/proto.c

ptvcursor_add_text_with_subtree(): Don't crash if called with a NULL tree.
Also fix up some indenting.
------------------------------------------------------------------------
r28839 | stig | 2009-06-24 18:50:56 -0700 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-infiniband.c

Remove a tvb_free() call.
------------------------------------------------------------------------
r31221 | wmeier | 2009-12-10 10:13:38 -0800 (Thu, 10 Dec 2009) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-radius.c

Fix Bug 4316: Crash when using custom RADIUS dictionary.
  (The bug was caused by a variable not being initialized).
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4316
------------------------------------------------------------------------
r31524 | gerald | 2010-01-13 17:22:00 -0800 (Wed, 13 Jan 2010) | 6 lines
Changed paths:
   M /trunk/epan/dissectors/packet-lwres.c

Fix several buffer overflows found by babi babi. Replace a lot of manual
fetching and displaying with proto_tree_add_item().

Use get_dns_name() instead of lwres_get_dns_name(), which fixes a separate
issue.
------------------------------------------------------------------------
r31560 | guy | 2010-01-18 15:21:13 -0800 (Mon, 18 Jan 2010) | 8 lines
Changed paths:
   M /trunk/doc/README.developer

Rewrite the bit about null vs. non-null "tree" dissector arguments a
bit, so as not to imply that there's some form of global "mode"
Wireshark is in when it passes a null or non-null pointer (there isn't),
and to explicitly note that there is *no* guarantee about the value of
"tree" on the first call to the dissector.  (I.e., please do not build a
mental model of how Wireshark works in that regard, and write your
dissector based on that mental model - you *will* be wrong.)
------------------------------------------------------------------------
r31626 | gerald | 2010-01-22 14:36:03 -0800 (Fri, 22 Jan 2010) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-kerberos.c

In our case, not being able to read the Kerberos configuration file
isn't a big deal.
------------------------------------------------------------------------


------------------------------------------------------------------------
r31687 | gerald | 2010-01-26 14:45:22 -0800 (Tue, 26 Jan 2010) | 2 lines
Changed paths:
   M /trunk-1.0/ChangeLog
   M /trunk-1.0/NEWS
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/tools/win32-setup.sh

Update the Windows library tag and documentation.

------------------------------------------------------------------------
r31688 | gerald | 2010-01-26 14:45:58 -0800 (Tue, 26 Jan 2010) | 2 lines
Changed paths:
   M /trunk-1.0/version.conf

Build 1.0.11.

------------------------------------------------------------------------
r31703 | gerald | 2010-01-27 08:08:44 -0800 (Wed, 27 Jan 2010) | 2 lines
Changed paths:
   M /trunk-1.0/packaging/macosx/Info.plist.in
   M /trunk-1.0/version_info.c

Update the copyright year.

------------------------------------------------------------------------
r31706 | gerald | 2010-01-27 11:31:03 -0800 (Wed, 27 Jan 2010) | 2 lines
Changed paths:
   M /trunk-1.0/debian/changelog

One last (?) change for 1.0.11.

------------------------------------------------------------------------
r31710 | gerald | 2010-01-27 17:19:49 -0800 (Wed, 27 Jan 2010) | 2 lines
Changed paths:
   M /trunk-1.0/config.nmake
   M /trunk-1.0/configure.in
   M /trunk-1.0/debian/changelog
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/version.conf

1.0.11 -> 1.0.12.

------------------------------------------------------------------------
r31742 | gerald | 2010-01-31 08:04:26 -0800 (Sun, 31 Jan 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-01-31]
------------------------------------------------------------------------
r31818 | gerald | 2010-02-07 08:04:02 -0800 (Sun, 07 Feb 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-02-07]
------------------------------------------------------------------------
r31878 | gerald | 2010-02-14 08:03:40 -0800 (Sun, 14 Feb 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-02-14]
------------------------------------------------------------------------
r31939 | gerald | 2010-02-21 08:02:57 -0800 (Sun, 21 Feb 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-02-21]
------------------------------------------------------------------------
r32047 | gerald | 2010-02-28 08:04:10 -0800 (Sun, 28 Feb 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-02-28]
------------------------------------------------------------------------
r32136 | gerald | 2010-03-07 08:04:03 -0800 (Sun, 07 Mar 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-03-07]
------------------------------------------------------------------------
r32186 | gerald | 2010-03-14 08:04:07 -0700 (Sun, 14 Mar 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-03-14]
------------------------------------------------------------------------
r32259 | gerald | 2010-03-21 08:04:32 -0700 (Sun, 21 Mar 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-03-21]
------------------------------------------------------------------------
r32317 | gerald | 2010-03-28 08:03:59 -0700 (Sun, 28 Mar 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-03-28]
------------------------------------------------------------------------
r32330 | gerald | 2010-03-30 16:33:56 -0700 (Tue, 30 Mar 2010) | 39 lines
Changed paths:
   M /trunk-1.0/AUTHORS
   M /trunk-1.0/configure.in
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/gtk/proto_draw.c
   M /trunk-1.0/wiretap/wtap.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r31787 | wmeier | 2010-02-04 07:03:30 -0800 (Thu, 04 Feb 2010) | 2 lines
Changed paths:
   M /trunk/gtk/main_proto_draw.c

Fix a typo....
------------------------------------------------------------------------


Copy over with manual intervention:

------------------------------------------------------------------------
r31786 | wmeier | 2010-02-04 06:41:22 -0800 (Thu, 04 Feb 2010) | 2 lines
Changed paths:
   M /trunk/gtk/main_proto_draw.c

Fix a crash which occurs if a progress bar is displayed while generating a hex bytes pane.
------------------------------------------------------------------------
r31918 | guy | 2010-02-18 16:05:34 -0800 (Thu, 18 Feb 2010) | 2 lines
Changed paths:
   M /trunk/configure.in

There's an echo in here....
------------------------------------------------------------------------
r32321 | guy | 2010-03-28 12:35:14 -0700 (Sun, 28 Mar 2010) | 4 lines
Changed paths:
   M /trunk/AUTHORS
   M /trunk/wiretap/wtap.c

From Robert Bullen: give the Bluetooth-H4-with-Linux-pseudo-header
encapsulation a name different from the no-pseudo-header H4
encapsulation.
------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r32339 | gerald | 2010-03-31 09:27:16 -0700 (Wed, 31 Mar 2010) | 2 lines
Changed paths:
   M /trunk-1.0/ChangeLog
   M /trunk-1.0/NEWS
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/version.conf

Build 1.0.12.

------------------------------------------------------------------------
r32347 | gerald | 2010-03-31 16:20:05 -0700 (Wed, 31 Mar 2010) | 2 lines
Changed paths:
   M /trunk-1.0/config.nmake
   M /trunk-1.0/configure.in
   M /trunk-1.0/debian/changelog
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/version.conf

1.0.12 -> 1.0.13.

------------------------------------------------------------------------
r32373 | gerald | 2010-04-04 08:04:06 -0700 (Sun, 04 Apr 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-04-04]
------------------------------------------------------------------------
r32445 | gerald | 2010-04-11 08:04:02 -0700 (Sun, 11 Apr 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-04-11]
------------------------------------------------------------------------
r32506 | gerald | 2010-04-18 08:04:01 -0700 (Sun, 18 Apr 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-04-18]
------------------------------------------------------------------------
r32555 | gerald | 2010-04-25 08:04:08 -0700 (Sun, 25 Apr 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-04-25]
------------------------------------------------------------------------
r32631 | gerald | 2010-05-02 08:04:07 -0700 (Sun, 02 May 2010) | 1 line
Changed paths:
   M /trunk-1.0/epan/enterprise-numbers
   M /trunk-1.0/manuf

[Automatic manuf and enterprise-numbers update for 2010-05-02]
------------------------------------------------------------------------
r32662 | gerald | 2010-05-04 14:44:03 -0700 (Tue, 04 May 2010) | 19 lines
Changed paths:
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/plugins/docsis/packet-bpkmreq.c
   M /trunk-1.0/plugins/docsis/packet-bpkmrsp.c
   M /trunk-1.0/plugins/docsis/packet-dsaack.c
   M /trunk-1.0/plugins/docsis/packet-dsarsp.c
   M /trunk-1.0/plugins/docsis/packet-dscack.c
   M /trunk-1.0/plugins/docsis/packet-dscrsp.c
   M /trunk-1.0/plugins/docsis/packet-dsdrsp.c
   M /trunk-1.0/plugins/docsis/packet-map.c
   M /trunk-1.0/plugins/docsis/packet-regack.c
   M /trunk-1.0/plugins/docsis/packet-regrsp.c
   M /trunk-1.0/plugins/mate/mate.h
   M /trunk-1.0/plugins/mate/mate_grammar.lemon
   M /trunk-1.0/plugins/mate/mate_setup.c

Copy over with manual intervention:
------------------------------------------------------------------------
r32396 | guy | 2010-04-05 19:49:18 -0700 (Mon, 05 Apr 2010) | 4 lines
Changed paths:
   M /trunk/plugins/docsis/packet-bpkmrsp.c

The third argument to val_to_str() is a format string that gets passed
the value that couldn't be mapped to a string - it's an integer and
needs to be printed with an integer format.  Fixes bug 4644.
------------------------------------------------------------------------
r32398 | morriss | 2010-04-06 06:40:06 -0700 (Tue, 06 Apr 2010) | 1 line
Changed paths:
   M /trunk/plugins/docsis/packet-regrsp.c

Don't use %s as the format string in val_to_str().  This fixes the fuzz failure in bug 4646.
------------------------------------------------------------------------

Update the release notes.

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