------------------------------------------------------------------------
r36117 | gerald | 2011-03-01 14:23:15 -0800 (Tue, 01 Mar 2011) | 2 lines
Changed paths:
   M /trunk-1.2/config.nmake
   M /trunk-1.2/configure.in
   M /trunk-1.2/debian/changelog
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

1.2.14 → 1.2.15.

------------------------------------------------------------------------
r36146 | gerald | 2011-03-06 10:05:31 -0800 (Sun, 06 Mar 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-03-06]
------------------------------------------------------------------------
r36185 | gerald | 2011-03-13 10:05:27 -0700 (Sun, 13 Mar 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-03-13]
------------------------------------------------------------------------
r36218 | gerald | 2011-03-20 10:05:36 -0700 (Sun, 20 Mar 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-03-20]
------------------------------------------------------------------------
r36374 | gerald | 2011-03-27 10:05:13 -0700 (Sun, 27 Mar 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-03-27]
------------------------------------------------------------------------
r36439 | gerald | 2011-04-03 10:05:35 -0700 (Sun, 03 Apr 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-04-03]
------------------------------------------------------------------------
r36541 | gerald | 2011-04-10 10:05:22 -0700 (Sun, 10 Apr 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-04-10]
------------------------------------------------------------------------
r36574 | gerald | 2011-04-11 17:43:52 -0700 (Mon, 11 Apr 2011) | 46 lines
Changed paths:
   M /trunk-1.2/Makefile.nmake
   M /trunk-1.2/config.nmake
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-ssl-utils.c
   M /trunk-1.2/epan/dissectors/packet-tcp.c
   M /trunk-1.2/packaging/nsis/wireshark.nsi
   M /trunk-1.2/text2pcap.c
   M /trunk-1.2/tools/win32-setup.sh
   M /trunk-1.2/tools/win64-setup.sh
   M /trunk-1.2/wiretap/netscreen.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r36174 | wmeier | 2011-03-08 16:43:49 -0800 (Tue, 08 Mar 2011) | 6 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ssl-utils.c

Check that imported private key is RSA; Prevents a crash.

Fixes Bug #5662

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662
------------------------------------------------------------------------
r36232 | sake | 2011-03-21 15:04:22 -0700 (Mon, 21 Mar 2011) | 3 lines
Changed paths:
   M /trunk/wiretap/netscreen.c

Fix for bug 5762, wireshark asserts on reading juniper snoop output when no hex data is present (snoop detail off).
------------------------------------------------------------------------



Copy over with manual intervention:

------------------------------------------------------------------------
r36162 | sake | 2011-03-08 03:26:34 -0800 (Tue, 08 Mar 2011) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-tcp.c

Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used
------------------------------------------------------------------------
r36190 | gerald | 2011-03-14 09:00:51 -0700 (Mon, 14 Mar 2011) | 2 lines
Changed paths:
   M /trunk/asn1/ldap/ldap.cnf
   M /trunk/epan/dissectors/packet-ldap.c

Properly initialize our filter counters.
------------------------------------------------------------------------
r36471 | tuexen | 2011-04-05 07:28:33 -0700 (Tue, 05 Apr 2011) | 3 lines
Changed paths:
   M /trunk/text2pcap.c

Fix a typo in the help message.
Reported by Matthias Wellmeyer.
------------------------------------------------------------------------

------------------------------------------------------------------------
r36613 | gerald | 2011-04-12 14:21:40 -0700 (Tue, 12 Apr 2011) | 18 lines
Changed paths:
   M /trunk-1.2/asn1/x509if/packet-x509if-template.c
   M /trunk-1.2/asn1/x509if/x509if.cnf
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-x509if.c

Copy over r36608 from the trunk:

------------------------------------------------------------------------
r36608 | gerald | 2011-04-12 13:39:48 -0700 (Tue, 12 Apr 2011) | 5 lines
Changed paths:
   M /trunk/asn1/x509if/packet-x509if-template.c
   M /trunk/asn1/x509if/x509if.cnf
   M /trunk/epan/dissectors/packet-x509if.c
   M /trunk/epan/dissectors/packet-x509if.h

Add x509if_frame_end() which is passed to register_frame_end_routine()
and which resets our global variables. Remove a boolean which was used
to track a char *; just check if the pointer is NULL instead. Fixes bugs
5754 and 5793, hopefully without breaking anything.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r36647 | gerald | 2011-04-14 14:29:30 -0700 (Thu, 14 Apr 2011) | 20 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/gtk/export_object.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r34805 | cmaynard | 2010-11-08 08:53:11 -0800 (Mon, 08 Nov 2010) | 4 lines
Changed paths:
   M /trunk/gtk/export_object.c

Allow objects to be saved that otherwise couldn't be due to invalid characters
in the filename, excessive filename lengths or duplicate filenames.  Fixes
bug 1671.
------------------------------------------------------------------------
r34808 | cmaynard | 2010-11-08 09:53:13 -0800 (Mon, 08 Nov 2010) | 2 lines
Changed paths:
   M /trunk/gtk/export_object.c

Make maxlen a gsize instead of a guint.
------------------------------------------------------------------------

Update the release notes.

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