User: gerald
Date: 2004/09/02 11:10 AM
Log:
Merge in changes from trunk. The merge was done on a non-Windows machine
in order to avoid the ethereal.desktop name case change, so the code
may not compile.
Directory: /branches/win32-native/plugins/artnet/
Changes Path Action
+112 -3 packet-artnet.c Modified
Directory: /branches/win32-native/plugins/asn1/
Changes Path Action
+2 -12 Makefile.nmake Modified
Directory: /branches/win32-native/docbook/dg-src/
Changes Path Action
+0 -0 EDG_chapter_build_intro.xml Added
+0 -0 EDG_chapter_dissection.xml Added
+0 -0 EDG_chapter_env_intro.xml Added
+0 -475 EDG_chapter_introduction.xml Removed
+0 -0 EDG_chapter_libraries.xml Added
+0 -0 EDG_chapter_sources.xml Added
+0 -0 EDG_chapter_tools.xml Added
+0 -0 EDG_chapter_userinterface.xml Added
+2 -2 EDG_meta_info.xml Modified
+12 -2 EDG_preface.xml Modified
Directory: /branches/win32-native/epan/dissectors/
Changes Path Action
+1 -0 Makefile.common Modified
+3 -2 packet-aim.c Modified
+0 -1 packet-aodv.c Modified
+2 -2 packet-atalk.c Modified
+12 -4 packet-ber.c Modified
+3 -2 packet-bgp.c Modified
+6 -5 packet-bootp.c Modified
+3 -2 packet-cast.c Modified
+59 -29 packet-clnp.c Modified
+3 -2 packet-cops.c Modified
+0 -0 packet-daap.c Added
+40 -98 packet-dcerpc-mapi.c Modified
+63 -50 packet-dcerpc-samr.c Modified
+2 -0 packet-dcerpc-samr.h Modified
+4 -3 packet-dcerpc.c Modified
+0 -1 packet-dhcpv6.c Modified
+3 -2 packet-diameter.c Modified
+3 -2 packet-distcc.c Modified
+3 -2 packet-dns.c Modified
+3 -2 packet-dsi.c Modified
+3 -2 packet-enip.c Modified
+3 -2 packet-fcip.c Modified
+3 -2 packet-h225.c Modified
+5 -4 packet-h245.c Modified
+18 -7 packet-http.c Modified
+4 -2 packet-image-jfif.c Modified
+3 -2 packet-ipdc.c Modified
+253 -209 packet-iscsi.c Modified
+4 -4 packet-isns.c Modified
+44 -18 packet-isup.c Modified
+65 -17 packet-kerberos.c Modified
+3 -2 packet-laplink.c Modified
+47 -45 packet-ldap.c Modified
+3 -2 packet-ldp.c Modified
+1 -1 packet-lwapp.c Modified
+4 -3 packet-mq.c Modified
+3 -2 packet-mysql.c Modified
+3 -2 packet-nbns.c Modified
+5 -4 packet-ncp.c Modified
+3 -11 packet-ncp2222.inc Modified
+5 -4 packet-ndmp.c Modified
+5 -4 packet-ndps.c Modified
+2 -2 packet-netbios.c Modified
+8 -9 packet-nfs.c Modified
+3 -2 packet-q931.c Modified
+123 -3 packet-radius.c Modified
+6 -5 packet-rpc.c Modified
+1 -5 packet-rsvp.c Modified
+4 -3 packet-rsync.c Modified
+5 -7 packet-rtcp.c Modified
+1 -2 packet-rtcp.h Modified
+5 -7 packet-rtp.c Modified
+1 -1 packet-rtp.h Modified
+6 -8 packet-rtsp.c Modified
+14 -15 packet-scsi.c Modified
+2 -2 packet-sdp.c Modified
+2 -2 packet-ses.c Modified
+9 -10 packet-sip.c Modified
+62 -51 packet-skinny.c Modified
+3 -2 packet-slsk.c Modified
+25 -55 packet-smb.c Modified
+3 -2 packet-smpp.c Modified
+3 -2 packet-smtp.c Modified
+3 -3 packet-snmp.c Modified
+3 -2 packet-srvloc.c Modified
+3 -2 packet-ssh.c Modified
+5 -4 packet-ssl.c Modified
+2 -1 packet-t38.c Modified
+48 -11 packet-tcp.c Modified
+5 -4 packet-tds.c Modified
+190 -119 packet-teredo.c Modified
+1 -1 packet-time.c Modified
+3 -2 packet-tns.c Modified
+3 -2 packet-tpkt.c Modified
+3 -2 packet-x11.c Modified
+3 -2 packet-xot.c Modified
+3 -2 packet-ymsg.c Modified
Directory: /branches/win32-native/doc/
Changes Path Action
+56 -16 README.developer Modified
+6 -4 README.tvbuff Modified
Directory: /branches/win32-native/docbook/
Changes Path Action
+0 -444 GFDPL_appendix.xml Removed
+0 -0 GPL_appendix.xml Added
+50 -3 Makefile Modified
+65 -5 developer-guide.xml Modified
+0 -95 ethereal-doc.txt Removed
+3 -3 user-guide.xml Modified
Directory: /branches/win32-native/epan/
Changes Path Action
+0 -2 Makefile.common Modified
+62 -36 column-utils.c Modified
+0 -551 int-64bit.c Removed
+0 -61 int-64bit.h Removed
(51 files not shown)
http://anonsvn.ethereal.com/viewcvs/viewcvs.py?rev=11882&view=rev