Prep for the 0.10.5 release.

svn path=/trunk/; revision=11319

3 files changed, 105 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index 12fc05fd00..43f426e1bc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,103 @@
-$Id: NEWS,v 1.151 2004/05/14 04:25:41 gerald Exp $
+$Id: NEWS,v 1.152 2004/07/06 16:29:18 gerald Exp $
+
+== July ??, 2004
+
+Ethereal 0.10.5 has been released.
+
+
+
+
+New and updated features
+
+Ethereal can now merge multiple files (you don't have to resort to 
+mergecap on the command line).
+
+A preview pane has been added to the file dialog.
+
+The capture progress dialog can now be disabled.
+
+The about dialog has received further improvements.
+
+The behavior of Ethereal's dialog windows has been normalized somewhat.
+
+The Windows installer can now associate standard file extensions with
+Ethereal.
+
+Ethereal can be configured not to bug you about unsaved captures.
+
+Ethereal can open help documentation using the default web browser.
+
+New protocol support
+
+DNP,
+giFT,
+H.235,
+PacketCable,
+SigComp,
+SIR (Serial Infrared),
+
+
+Updated protocol support
+
+AIM,
+ASAP,
+ASN.1 BER,
+ARP,
+ATM,
+DHCP,
+CFPI,
+CLNP,
+DCERPC (DCERPC, LSA, NT, SAMR, SRVSVC, WKSSVC),
+EAP,
+ENIP,
+Frame Relay,
+GRE,
+H.225,
+H.245,
+H.450,
+HTTP,
+IAX2,
+IEEE 802.11,
+ISAKMP,
+iSNS,
+ISUP,
+JFIF,
+Kerberos,
+LMP,
+M3UA,
+MGCP,
+MPLS,
+MTP3,
+NCP,
+NetFlow,
+NFS,
+OSPF,
+RADIUS,
+RIP,
+RSVP,
+RTCP,
+RTP,
+RTSP,
+SCSI,
+SDP,
+SIP,
+SMB,
+SMTP,
+SNMP,
+SOCKS,
+SSL,
+T.35,
+TCP,
+VRRP,
+WBXML,
+WSP,
+X11,
+
+
+Capture file support
+
+Radcom,
+
 
 == May 13, 2004
 
diff --git a/config.nmake b/config.nmake
index 74ad920ddd..7416e75fa2 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,6 +1,6 @@
-# $Id: config.nmake,v 1.93 2004/06/20 20:28:23 ulfl Exp $
+# $Id: config.nmake,v 1.94 2004/07/06 16:29:18 gerald Exp $
 
-VERSION=0.10.4
+VERSION=0.10.5
 #
 # The RC_VERSION should be comma-separated, not dot-separated, 
 # as per Graham Bloice's message in
@@ -12,7 +12,7 @@ VERSION=0.10.4
 # number to be correctly displayed in the explorer properties dialog
 # for the executables, and XP's tooltip, rather than 0.0.0.0."
 #
-RC_VERSION=0,10,4
+RC_VERSION=0,10,5
 WTAP_VERSION=0.1
 
 #
diff --git a/configure.in b/configure.in
index a794ce47bf..c51f4f6c9a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.273 2004/06/25 07:10:53 jmayer Exp $
+# $Id: configure.in,v 1.274 2004/07/06 16:29:18 gerald Exp $
 #
 AC_INIT(etypes.h)
 
@@ -8,7 +8,7 @@ dnl Check for CPU / vendor / OS
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(ethereal, 0.10.4)
+AM_INIT_AUTOMAKE(ethereal, 0.10.5)
 
 AM_DISABLE_STATIC