aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-03-17 15:57:02 +0100
committerAnders Broman <a.broman58@gmail.com>2014-03-31 18:48:06 +0000
commit757aa3322029a673e4f60c67041a796ce15e4828 (patch)
treeff4da6baa18e663a854a7c0863bd9fad2ac2f1b2
parentfb61a0afa9b3ac5a6d3b0efa21e19b74d6aef175 (diff)
Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--CMakeLists.txt2
-rw-r--r--CMakeOptions.txt2
-rw-r--r--CPackConfig.txt2
-rw-r--r--ConfigureChecks.cmake2
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.am.inc2
-rw-r--r--Makefile.common2
-rw-r--r--Makefile.nmake2
-rw-r--r--Makefile.nmake.inc2
-rw-r--r--aclocal-fallback/glib-2.0.m42
-rw-r--r--aclocal-fallback/gtk-2.0.m41
-rw-r--r--aclocal-fallback/gtk-3.0.m41
-rw-r--r--aclocal-fallback/libsmi.m41
-rwxr-xr-xaclocal-flags2
-rw-r--r--cmake/modules/CMakeInstallDirs.cmake2
-rw-r--r--cmake/modules/FindADNS.cmake2
-rw-r--r--cmake/modules/FindAIRPCAP.cmake2
-rw-r--r--cmake/modules/FindASCIIDOC.cmake2
-rw-r--r--cmake/modules/FindCAP.cmake2
-rw-r--r--cmake/modules/FindCARES.cmake2
-rw-r--r--cmake/modules/FindDOXYGEN.cmake2
-rw-r--r--cmake/modules/FindFOP.cmake2
-rw-r--r--cmake/modules/FindFreetype.cmake2
-rw-r--r--cmake/modules/FindGCRYPT.cmake2
-rw-r--r--cmake/modules/FindGEOIP.cmake2
-rw-r--r--cmake/modules/FindGLIB2.cmake2
-rw-r--r--cmake/modules/FindGMODULE2.cmake2
-rw-r--r--cmake/modules/FindGNUTLS.cmake2
-rw-r--r--cmake/modules/FindGTHREAD2.cmake2
-rw-r--r--cmake/modules/FindGTK3.cmake2
-rw-r--r--cmake/modules/FindHtmlViewer.cmake2
-rw-r--r--cmake/modules/FindKERBEROS.cmake2
-rw-r--r--cmake/modules/FindLEX.cmake2
-rw-r--r--cmake/modules/FindLUA.cmake2
-rw-r--r--cmake/modules/FindLYNX.cmake2
-rw-r--r--cmake/modules/FindM.cmake2
-rw-r--r--cmake/modules/FindNL.cmake2
-rw-r--r--cmake/modules/FindPCAP.cmake2
-rw-r--r--cmake/modules/FindPOD.cmake2
-rw-r--r--cmake/modules/FindPORTAUDIO.cmake2
-rw-r--r--cmake/modules/FindSED.cmake2
-rw-r--r--cmake/modules/FindSETCAP.cmake2
-rw-r--r--cmake/modules/FindSH.cmake2
-rw-r--r--cmake/modules/FindSMI.cmake2
-rw-r--r--cmake/modules/FindWSWinLibs.cmake2
-rw-r--r--cmake/modules/FindXMLLINT.cmake2
-rw-r--r--cmake/modules/FindXSLTPROC.cmake2
-rw-r--r--cmake/modules/FindYACC.cmake2
-rw-r--r--cmake/modules/FindYAPP.cmake2
-rw-r--r--cmake/modules/FindZLIB.cmake2
-rw-r--r--cmake/modules/UseABICheck.cmake2
-rw-r--r--cmake/modules/UseAsn2Wrs.cmake2
-rw-r--r--cmake/modules/UseCheckAPI.cmake2
-rw-r--r--cmake/modules/UseLemon.cmake2
-rw-r--r--cmake/modules/UseMakeDissectorReg.cmake2
-rw-r--r--cmake/modules/UseMakeTapReg.cmake2
-rw-r--r--cmake/modules/UseWinLibs.cmake2
-rw-r--r--codecs/CMakeLists.txt2
-rw-r--r--codecs/Makefile.am2
-rw-r--r--codecs/Makefile.common2
-rw-r--r--codecs/Makefile.nmake1
-rw-r--r--config.nmake2
-rw-r--r--debian/wireshark-root.desktop1
-rw-r--r--debian/wireshark.desktop2
-rw-r--r--diameter/Custom.make4
-rw-r--r--docbook/CMakeLists.txt2
-rw-r--r--docbook/Makefile.am2
-rw-r--r--docbook/Makefile.common2
-rw-r--r--docbook/Makefile.nmake2
-rw-r--r--docbook/asciidoc.conf1
-rwxr-xr-xdocbook/check_git_version.sh2
-rwxr-xr-xdocbook/dfilter2xml.pl2
-rwxr-xr-xdocbook/make-wsluarm.pl2
-rw-r--r--doxygen.cfg.in2
-rw-r--r--echld/CMakeLists.txt2
-rw-r--r--echld/Makefile.am2
-rw-r--r--echld/Makefile.common2
-rw-r--r--echld/Makefile.nmake1
-rw-r--r--epan/CMakeLists.txt2
-rw-r--r--epan/Makefile.am2
-rw-r--r--epan/Makefile.common2
-rw-r--r--epan/Makefile.nmake1
-rw-r--r--epan/crypt/Makefile.am2
-rw-r--r--epan/crypt/Makefile.common2
-rw-r--r--epan/crypt/Makefile.nmake1
-rw-r--r--epan/dfilter/Makefile.am2
-rw-r--r--epan/dfilter/Makefile.common2
-rw-r--r--epan/dfilter/Makefile.nmake1
-rw-r--r--epan/dissectors/Makefile.am2
-rw-r--r--epan/dissectors/Makefile.common2
-rw-r--r--epan/dissectors/Makefile.nmake1
-rw-r--r--epan/dissectors/dcerpc/CMakeLists.txt2
-rw-r--r--epan/dissectors/dcerpc/Makefile.am2
-rw-r--r--epan/dissectors/dcerpc/Makefile.inc2
-rw-r--r--epan/dissectors/dcerpc/budb/Makefile2
-rw-r--r--epan/dissectors/dcerpc/butc/Makefile2
-rw-r--r--epan/dissectors/dcerpc/drsuapi/Makefile2
-rw-r--r--epan/dissectors/pidl/Makefile.am2
-rw-r--r--epan/dissectors/pidl/srvsvc.cnf2
-rw-r--r--epan/dissectors/x11-fields2
-rw-r--r--epan/doxygen.cfg.in1
-rw-r--r--epan/ftypes/Makefile.am2
-rw-r--r--epan/ftypes/Makefile.common2
-rw-r--r--epan/ftypes/Makefile.nmake1
-rw-r--r--epan/wmem/Makefile.am2
-rw-r--r--epan/wmem/Makefile.common2
-rw-r--r--epan/wmem/Makefile.nmake1
-rw-r--r--epan/wslua/CMakeLists.txt2
-rw-r--r--epan/wslua/Makefile.am2
-rw-r--r--epan/wslua/Makefile.nmake2
-rwxr-xr-xepan/wslua/make-init-lua.pl2
-rwxr-xr-xepan/wslua/make-reg.pl2
-rwxr-xr-xepan/wslua/make-taps.pl2
-rw-r--r--epan/wslua/taps2
-rw-r--r--epan/wspython/CMakeLists.txt2
-rw-r--r--epan/wspython/Makefile.am2
-rw-r--r--epan/wspython/Makefile.common2
-rw-r--r--epan/wspython/Makefile.nmake2
-rwxr-xr-xepan/wspython/register-dissector.py2
-rwxr-xr-xepan/wspython/wspy_dissector.py2
-rwxr-xr-xepan/wspython/wspy_libws.py2
-rw-r--r--filetap/CMakeLists.txt2
-rw-r--r--filetap/Makefile.am2
-rw-r--r--filetap/Makefile.common2
-rw-r--r--filetap/Makefile.nmake2
-rw-r--r--help/Makefile.am2
-rw-r--r--help/Makefile.nmake1
-rwxr-xr-xhelp/faq.py2
-rw-r--r--image/Makefile.nmake2
-rwxr-xr-xmacosx-setup.sh2
-rwxr-xr-xmake-version.pl2
-rw-r--r--manuf4
-rw-r--r--manuf.tmpl2
-rw-r--r--packaging/Makefile.am2
-rw-r--r--packaging/Makefile.nmake2
-rwxr-xr-xpackaging/macosx/ChmodBPF/ChmodBPF1
-rw-r--r--packaging/macosx/Makefile.am2
-rwxr-xr-xpackaging/macosx/Resources/bin/getdisplay.sh2
-rwxr-xr-xpackaging/macosx/Resources/bin/wireshark2
-rwxr-xr-xpackaging/macosx/Resources/openDoc2
-rwxr-xr-xpackaging/macosx/Resources/script2
-rwxr-xr-xpackaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh2
-rwxr-xr-xpackaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh2
-rw-r--r--packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc2
-rw-r--r--packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc2
-rwxr-xr-xpackaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh2
-rwxr-xr-xpackaging/macosx/ScriptExec/openDoc2
-rwxr-xr-xpackaging/macosx/ScriptExec/script2
-rwxr-xr-xpackaging/macosx/native-gtk/build-gtk.sh2
-rwxr-xr-xpackaging/macosx/osx-app.sh2
-rwxr-xr-xpackaging/macosx/osx-dmg.sh.in2
-rwxr-xr-xpackaging/macosx/utility-launcher/wireshark2
-rw-r--r--packaging/nsis/Custom.nmake2
-rw-r--r--packaging/nsis/Makefile.am2
-rw-r--r--packaging/nsis/Makefile.nmake2
-rw-r--r--packaging/portableapps/win32/Makefile.nmake2
-rw-r--r--packaging/portableapps/win32/WiresharkPortable.tmpl2
-rwxr-xr-xpackaging/portableapps/win32/makenmake.pl2
-rw-r--r--packaging/rpm/Makefile.am2
-rw-r--r--packaging/rpm/SPECS/Makefile.am2
-rw-r--r--packaging/rpm/SPECS/wireshark.spec.in1
-rw-r--r--packaging/svr4/Makefile.am2
-rwxr-xr-xpackaging/svr4/checkinstall.in2
-rwxr-xr-xpackaging/svr4/mkpkg2
-rw-r--r--packaging/svr4/pkginfo.in1
-rwxr-xr-xpackaging/ws-manifest.pl2
-rw-r--r--plugins/Custom.m4.example2
-rw-r--r--plugins/Custom.make.example2
-rw-r--r--plugins/Custom.nmake.example2
-rw-r--r--plugins/Makefile.am2
-rw-r--r--plugins/Makefile.common.inc2
-rw-r--r--plugins/Makefile.nmake2
-rw-r--r--plugins/asn1/CMakeLists.txt2
-rw-r--r--plugins/asn1/Makefile.am2
-rw-r--r--plugins/asn1/Makefile.common2
-rw-r--r--plugins/asn1/Makefile.nmake2
-rw-r--r--plugins/asn1/moduleinfo.nmake2
-rw-r--r--plugins/docsis/CMakeLists.txt2
-rw-r--r--plugins/docsis/Makefile.am2
-rw-r--r--plugins/docsis/Makefile.common2
-rw-r--r--plugins/docsis/Makefile.nmake2
-rw-r--r--plugins/docsis/moduleinfo.nmake2
-rw-r--r--plugins/easy_codec/Makefile.common2
-rw-r--r--plugins/easy_codec/Makefile.nmake2
-rw-r--r--plugins/easy_codec/moduleinfo.nmake2
-rw-r--r--plugins/ethercat/CMakeLists.txt2
-rw-r--r--plugins/ethercat/Makefile.am2
-rw-r--r--plugins/ethercat/Makefile.common2
-rw-r--r--plugins/ethercat/Makefile.nmake2
-rw-r--r--plugins/ethercat/moduleinfo.nmake2
-rw-r--r--plugins/gryphon/CMakeLists.txt2
-rw-r--r--plugins/gryphon/Makefile.am2
-rw-r--r--plugins/gryphon/Makefile.common2
-rw-r--r--plugins/gryphon/Makefile.nmake2
-rw-r--r--plugins/gryphon/moduleinfo.nmake2
-rw-r--r--plugins/irda/CMakeLists.txt2
-rw-r--r--plugins/irda/Makefile.am2
-rw-r--r--plugins/irda/Makefile.common2
-rw-r--r--plugins/irda/Makefile.nmake2
-rw-r--r--plugins/irda/moduleinfo.nmake2
-rw-r--r--plugins/m2m/CMakeLists.txt2
-rw-r--r--plugins/m2m/Makefile.am2
-rw-r--r--plugins/m2m/Makefile.common2
-rw-r--r--plugins/m2m/Makefile.nmake2
-rw-r--r--plugins/m2m/moduleinfo.nmake2
-rw-r--r--plugins/mate/CMakeLists.txt2
-rw-r--r--plugins/mate/Makefile.am2
-rw-r--r--plugins/mate/Makefile.common2
-rw-r--r--plugins/mate/Makefile.nmake2
-rw-r--r--plugins/mate/examples/call.mate1
-rw-r--r--plugins/mate/examples/mms.mate1
-rw-r--r--plugins/mate/examples/pasv_ftp.mate2
-rw-r--r--plugins/mate/examples/tcp.mate2
-rw-r--r--plugins/mate/examples/web.mate1
-rw-r--r--plugins/mate/matelib/dns.mate1
-rw-r--r--plugins/mate/matelib/h225_ras.mate1
-rw-r--r--plugins/mate/matelib/isup.mate2
-rw-r--r--plugins/mate/matelib/megaco.mate1
-rw-r--r--plugins/mate/matelib/q931.mate1
-rw-r--r--plugins/mate/matelib/radius.mate1
-rw-r--r--plugins/mate/matelib/rtsp.mate1
-rw-r--r--plugins/mate/matelib/sip.mate1
-rw-r--r--plugins/mate/moduleinfo.nmake2
-rw-r--r--plugins/opcua/CMakeLists.txt2
-rw-r--r--plugins/opcua/Makefile.am2
-rw-r--r--plugins/opcua/Makefile.common2
-rw-r--r--plugins/opcua/Makefile.nmake2
-rw-r--r--plugins/opcua/moduleinfo.nmake2
-rw-r--r--plugins/profinet/CMakeLists.txt2
-rw-r--r--plugins/profinet/Makefile.am2
-rw-r--r--plugins/profinet/Makefile.common2
-rw-r--r--plugins/profinet/Makefile.nmake2
-rw-r--r--plugins/profinet/moduleinfo.nmake2
-rw-r--r--plugins/stats_tree/CMakeLists.txt2
-rw-r--r--plugins/stats_tree/Makefile.am2
-rw-r--r--plugins/stats_tree/Makefile.common2
-rw-r--r--plugins/stats_tree/Makefile.nmake2
-rw-r--r--plugins/stats_tree/moduleinfo.nmake2
-rw-r--r--plugins/tpg/CMakeLists.txt2
-rw-r--r--plugins/tpg/Makefile.am2
-rw-r--r--plugins/tpg/Makefile.nmake2
-rw-r--r--plugins/tpg/http.tpg2
-rw-r--r--plugins/unistim/CMakeLists.txt2
-rw-r--r--plugins/unistim/Makefile.am2
-rw-r--r--plugins/unistim/Makefile.common2
-rw-r--r--plugins/unistim/Makefile.nmake2
-rw-r--r--plugins/unistim/moduleinfo.nmake2
-rw-r--r--plugins/wimax/CMakeLists.txt2
-rw-r--r--plugins/wimax/Makefile.am2
-rw-r--r--plugins/wimax/Makefile.common2
-rw-r--r--plugins/wimax/Makefile.nmake2
-rw-r--r--plugins/wimax/moduleinfo.nmake2
-rw-r--r--plugins/wimaxasncp/CMakeLists.txt2
-rw-r--r--plugins/wimaxasncp/Makefile.am2
-rw-r--r--plugins/wimaxasncp/Makefile.common2
-rw-r--r--plugins/wimaxasncp/Makefile.nmake2
-rw-r--r--plugins/wimaxasncp/moduleinfo.nmake2
-rw-r--r--plugins/wimaxmacphy/CMakeLists.txt2
-rw-r--r--plugins/wimaxmacphy/Makefile.am2
-rw-r--r--plugins/wimaxmacphy/Makefile.common2
-rw-r--r--plugins/wimaxmacphy/Makefile.nmake2
-rw-r--r--plugins/wimaxmacphy/moduleinfo.nmake2
-rw-r--r--radius/Custom.make2
-rw-r--r--radius/dictionary.acme2
-rw-r--r--radius/dictionary.iea2
-rwxr-xr-xtest/config.sh2
-rw-r--r--test/hosts.custom1
-rw-r--r--test/hosts.global1
-rw-r--r--test/hosts.personal1
-rwxr-xr-xtest/suite-capture.sh2
-rwxr-xr-xtest/suite-clopts.sh2
-rwxr-xr-xtest/suite-decryption.sh2
-rwxr-xr-xtest/suite-fileformats.sh2
-rwxr-xr-xtest/suite-io.sh2
-rwxr-xr-xtest/suite-nameres.sh2
-rwxr-xr-xtest/suite-unittests.sh2
-rwxr-xr-xtest/suite-wslua.sh2
-rwxr-xr-xtest/test-backend.sh2
-rwxr-xr-xtest/test.sh2
-rwxr-xr-xtools/cppcheck/cppcheck.sh2
-rwxr-xr-xtools/dftestlib/__init__.py2
-rwxr-xr-xtools/dftestlib/bytes_ether.py2
-rwxr-xr-xtools/dftestlib/bytes_ipv6.py2
-rwxr-xr-xtools/dftestlib/bytes_type.py2
-rwxr-xr-xtools/dftestlib/dftest.py2
-rwxr-xr-xtools/dftestlib/double.py2
-rwxr-xr-xtools/dftestlib/integer.py2
-rwxr-xr-xtools/dftestlib/integer_1byte.py2
-rwxr-xr-xtools/dftestlib/ipv4.py2
-rwxr-xr-xtools/dftestlib/range_method.py2
-rwxr-xr-xtools/dftestlib/scanner.py2
-rwxr-xr-xtools/dftestlib/string_type.py2
-rwxr-xr-xtools/dftestlib/stringz.py2
-rwxr-xr-xtools/dftestlib/time_relative.py2
-rwxr-xr-xtools/dftestlib/time_type.py2
-rwxr-xr-xtools/dftestlib/tvb.py2
-rwxr-xr-xtools/dftestlib/uint64.py2
-rwxr-xr-xtools/dftestlib/util.py2
-rw-r--r--tools/lemon/CMakeLists.txt2
-rw-r--r--tools/lemon/Makefile.am2
-rw-r--r--tools/lemon/Makefile.nmake1
-rw-r--r--tools/tpg/Makefile.am2
-rw-r--r--tools/tpg/Makefile.nmake1
-rw-r--r--tools/tpg/V2P.pm2
-rwxr-xr-xtools/tpg/tpg.pl2
-rw-r--r--tools/tpg/tpg.yp2
-rw-r--r--tpncp/tpncp.dat1
-rw-r--r--ui/CMakeLists.txt2
-rw-r--r--ui/Makefile.am2
-rw-r--r--ui/Makefile.common2
-rw-r--r--ui/Makefile.nmake1
-rw-r--r--ui/cli/Makefile.am2
-rw-r--r--ui/cli/Makefile.common2
-rw-r--r--ui/cli/Makefile.nmake1
-rw-r--r--ui/doxygen.cfg.in1
-rw-r--r--ui/gtk/CMakeLists.txt2
-rw-r--r--ui/gtk/Makefile.am2
-rw-r--r--ui/gtk/Makefile.common2
-rw-r--r--ui/gtk/Makefile.nmake1
-rw-r--r--ui/gtk/Makefile_custom.common3
-rw-r--r--ui/gtk/doxygen.cfg.in1
-rw-r--r--ui/qt/CMakeLists.txt2
-rw-r--r--ui/qt/Makefile.am2
-rw-r--r--ui/qt/Makefile.common2
-rw-r--r--ui/qt/Makefile_custom.common3
-rw-r--r--ui/qt/QtShark.pro2
-rw-r--r--ui/qt/doxygen.cfg.in1
-rw-r--r--ui/win32/Makefile.nmake1
-rw-r--r--ui/win32/settings.ini1
-rw-r--r--wireshark.desktop1
-rw-r--r--wiretap/CMakeLists.txt2
-rw-r--r--wiretap/Makefile.am2
-rw-r--r--wiretap/Makefile.common2
-rw-r--r--wiretap/Makefile.nmake2
-rw-r--r--wka.tmpl2
-rw-r--r--wsutil/CMakeLists.txt2
-rw-r--r--wsutil/Makefile.am2
-rw-r--r--wsutil/Makefile.common2
-rw-r--r--wsutil/Makefile.nmake1
339 files changed, 6 insertions, 634 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dd8b084a7..543c566254 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index 26fd117957..d1cf4d926c 100644
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -1,7 +1,5 @@
# Build options for use by CMake
-# $Id$
-
option(BUILD_wireshark "Build the GTK+-GUI version of Wireshark" ON)
option(BUILD_qtshark "Build the Qt-GUI version of Wireshark" ON)
option(BUILD_tshark "Build tshark" ON)
diff --git a/CPackConfig.txt b/CPackConfig.txt
index 370f34abd0..25790ade0b 100644
--- a/CPackConfig.txt
+++ b/CPackConfig.txt
@@ -1,7 +1,5 @@
# CPackConfig.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index b4402b0ab2..918a62803d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -1,7 +1,5 @@
# ConfigureChecks.cmake
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/Makefile.am b/Makefile.am
index e9337fc398..8d41d8509a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for Wireshark
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/Makefile.am.inc b/Makefile.am.inc
index 54606b2c16..5a107689e7 100644
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -1,8 +1,6 @@
# Makefile.am.inc
# Include file for Makefile.am files to get additional rules
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/Makefile.common b/Makefile.common
index e585a06601..43350b8f51 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/Makefile.nmake b/Makefile.nmake
index 32f8c2e0b1..7458d605a2 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,8 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
-
# We "Deploy using XCopy," which is described at
# http://msdn.microsoft.com/en-us/library/ms235291.aspx
diff --git a/Makefile.nmake.inc b/Makefile.nmake.inc
index 5bc868e992..b7b5c4e470 100644
--- a/Makefile.nmake.inc
+++ b/Makefile.nmake.inc
@@ -1,8 +1,6 @@
# Makefile.nmake.inc
# Include file for Makefile.am files to get additional rules
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2007 Gerald Combs
diff --git a/aclocal-fallback/glib-2.0.m4 b/aclocal-fallback/glib-2.0.m4
index 81467eade2..f0ae170e0e 100644
--- a/aclocal-fallback/glib-2.0.m4
+++ b/aclocal-fallback/glib-2.0.m4
@@ -1,7 +1,5 @@
# Configure paths for GLIB
# Owen Taylor 1997-2001
-# $Id$
-
dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
dnl gthread is specified in MODULES, pass to pkg-config
diff --git a/aclocal-fallback/gtk-2.0.m4 b/aclocal-fallback/gtk-2.0.m4
index b40e3bcdd3..1c9321d56a 100644
--- a/aclocal-fallback/gtk-2.0.m4
+++ b/aclocal-fallback/gtk-2.0.m4
@@ -1,6 +1,5 @@
# Configure paths for GTK+
# Owen Taylor 1997-2001
-# $Id$
dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
diff --git a/aclocal-fallback/gtk-3.0.m4 b/aclocal-fallback/gtk-3.0.m4
index e71c8cd0f5..4706b60244 100644
--- a/aclocal-fallback/gtk-3.0.m4
+++ b/aclocal-fallback/gtk-3.0.m4
@@ -1,6 +1,5 @@
# Configure paths for GTK+
# Owen Taylor 1997-2001
-# $Id$
dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
diff --git a/aclocal-fallback/libsmi.m4 b/aclocal-fallback/libsmi.m4
index 69e8d74158..4019528f1f 100644
--- a/aclocal-fallback/libsmi.m4
+++ b/aclocal-fallback/libsmi.m4
@@ -1,6 +1,5 @@
# Configure paths for libsmi
# Shamelessly stolen from http://autoconf-archive.cryp.to/ax_lib_sqlite3.html
-# $Id$
# Synopsis: AX_LIBSMI([minimum library version])
# The default minimum library version is 2
diff --git a/aclocal-flags b/aclocal-flags
index e8a4209d07..49af718c8c 100755
--- a/aclocal-flags
+++ b/aclocal-flags
@@ -36,8 +36,6 @@
# and Glib are installed with the same prefix, we should only supply one
# "-I" flag for both of them.
#
-# $Id$
-#
#
# OK, where will aclocal look by default?
diff --git a/cmake/modules/CMakeInstallDirs.cmake b/cmake/modules/CMakeInstallDirs.cmake
index dba19217c2..9aef8a21a4 100644
--- a/cmake/modules/CMakeInstallDirs.cmake
+++ b/cmake/modules/CMakeInstallDirs.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
###################################################################
#
# Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
diff --git a/cmake/modules/FindADNS.cmake b/cmake/modules/FindADNS.cmake
index 9b4fe39399..596019556f 100644
--- a/cmake/modules/FindADNS.cmake
+++ b/cmake/modules/FindADNS.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find adns
# Find the native ADNS includes and library
#
diff --git a/cmake/modules/FindAIRPCAP.cmake b/cmake/modules/FindAIRPCAP.cmake
index bbba66a444..afc93f97c0 100644
--- a/cmake/modules/FindAIRPCAP.cmake
+++ b/cmake/modules/FindAIRPCAP.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find airpcap
# Find the native AIRPCAP includes and library
#
diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake
index 221781e19f..f414c547db 100644
--- a/cmake/modules/FindASCIIDOC.cmake
+++ b/cmake/modules/FindASCIIDOC.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindCAP.cmake b/cmake/modules/FindCAP.cmake
index ec4fdd90fe..09d3b86620 100644
--- a/cmake/modules/FindCAP.cmake
+++ b/cmake/modules/FindCAP.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find capabilities
# Find the native CAP includes and library
#
diff --git a/cmake/modules/FindCARES.cmake b/cmake/modules/FindCARES.cmake
index ae552517fb..1d90838f2a 100644
--- a/cmake/modules/FindCARES.cmake
+++ b/cmake/modules/FindCARES.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find cares
# Find the native CARES includes and library
#
diff --git a/cmake/modules/FindDOXYGEN.cmake b/cmake/modules/FindDOXYGEN.cmake
index 7dabad6cb5..23a99fdcc6 100644
--- a/cmake/modules/FindDOXYGEN.cmake
+++ b/cmake/modules/FindDOXYGEN.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindFOP.cmake b/cmake/modules/FindFOP.cmake
index 6383ad829d..1b654ab6e9 100644
--- a/cmake/modules/FindFOP.cmake
+++ b/cmake/modules/FindFOP.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindFreetype.cmake b/cmake/modules/FindFreetype.cmake
index 71c5d6b8ec..0f0deb3313 100644
--- a/cmake/modules/FindFreetype.cmake
+++ b/cmake/modules/FindFreetype.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Locate FreeType library
# This module defines
# FREETYPE_LIBRARIES, the library to link against
diff --git a/cmake/modules/FindGCRYPT.cmake b/cmake/modules/FindGCRYPT.cmake
index 8c37e59a0d..638ddfedba 100644
--- a/cmake/modules/FindGCRYPT.cmake
+++ b/cmake/modules/FindGCRYPT.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find gcrypt
# Find the native GCRYPT includes and library
#
diff --git a/cmake/modules/FindGEOIP.cmake b/cmake/modules/FindGEOIP.cmake
index bfd4c933f4..c166eeec07 100644
--- a/cmake/modules/FindGEOIP.cmake
+++ b/cmake/modules/FindGEOIP.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find GeoIP
# Find the native GEOIP includes and library
#
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake
index 7e603997b9..30fd04d45e 100644
--- a/cmake/modules/FindGLIB2.cmake
+++ b/cmake/modules/FindGLIB2.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Try to find the GLIB2 libraries
# Once done this will define
#
diff --git a/cmake/modules/FindGMODULE2.cmake b/cmake/modules/FindGMODULE2.cmake
index 066c695abc..a7575703d0 100644
--- a/cmake/modules/FindGMODULE2.cmake
+++ b/cmake/modules/FindGMODULE2.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Try to find GModule2
# Find GModule headers, libraries and the answer to all questions.
#
diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake
index ef37d1e9b1..8a21922d21 100644
--- a/cmake/modules/FindGNUTLS.cmake
+++ b/cmake/modules/FindGNUTLS.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find gnutls
# Find the native GNUTLS includes and library
#
diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake
index 26fd9e7028..182df7c2ab 100644
--- a/cmake/modules/FindGTHREAD2.cmake
+++ b/cmake/modules/FindGTHREAD2.cmake
@@ -1,7 +1,5 @@
# - Try to find GThread2
#
-# $Id$
-#
# Find GThread headers, libraries and the answer to all questions.
#
# GTHREAD2_FOUND True if GTHREAD2 got found
diff --git a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake
index 7a964a6227..b66aa3e722 100644
--- a/cmake/modules/FindGTK3.cmake
+++ b/cmake/modules/FindGTK3.cmake
@@ -1,7 +1,5 @@
# - Try to find GTK3
#
-# $Id$
-#
# Once done this will define
#
# GTK3_FOUND - System has GTK3
diff --git a/cmake/modules/FindHtmlViewer.cmake b/cmake/modules/FindHtmlViewer.cmake
index 18bafcb989..038c957e89 100644
--- a/cmake/modules/FindHtmlViewer.cmake
+++ b/cmake/modules/FindHtmlViewer.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find an html viewer program
#
# HTML_VIEWER_EXECUTABLE - the full path to perl
diff --git a/cmake/modules/FindKERBEROS.cmake b/cmake/modules/FindKERBEROS.cmake
index 4cd312c7f4..10d769d1e7 100644
--- a/cmake/modules/FindKERBEROS.cmake
+++ b/cmake/modules/FindKERBEROS.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find kerberos
# Find the native KERBEROS includes and library
#
diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake
index f463e3b7a6..1c413b716b 100644
--- a/cmake/modules/FindLEX.cmake
+++ b/cmake/modules/FindLEX.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find lex executable
#
diff --git a/cmake/modules/FindLUA.cmake b/cmake/modules/FindLUA.cmake
index d0a46a973f..7cbcae4a1d 100644
--- a/cmake/modules/FindLUA.cmake
+++ b/cmake/modules/FindLUA.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Locate Lua library
# This module defines
# LUA_FOUND, if false, do not try to link to Lua
diff --git a/cmake/modules/FindLYNX.cmake b/cmake/modules/FindLYNX.cmake
index 5efe609ebf..bc0b7b0bdc 100644
--- a/cmake/modules/FindLYNX.cmake
+++ b/cmake/modules/FindLYNX.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindM.cmake b/cmake/modules/FindM.cmake
index b2177dcbab..f0779bffff 100644
--- a/cmake/modules/FindM.cmake
+++ b/cmake/modules/FindM.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find math
# Find the native M includes and library
#
diff --git a/cmake/modules/FindNL.cmake b/cmake/modules/FindNL.cmake
index 77f0f87b8d..dea96ba4b0 100644
--- a/cmake/modules/FindNL.cmake
+++ b/cmake/modules/FindNL.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Find the native netlink includes and library
#
# If they exist, differentiate between versions 1, 2 and 3.
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake
index 5821627611..d468a26bf1 100644
--- a/cmake/modules/FindPCAP.cmake
+++ b/cmake/modules/FindPCAP.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find pcap and winpcap
# Find the native PCAP includes and library
#
diff --git a/cmake/modules/FindPOD.cmake b/cmake/modules/FindPOD.cmake
index 32acac2bfe..c7bc5f9ef5 100644
--- a/cmake/modules/FindPOD.cmake
+++ b/cmake/modules/FindPOD.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindPORTAUDIO.cmake b/cmake/modules/FindPORTAUDIO.cmake
index 3735ddb7f7..6478313e46 100644
--- a/cmake/modules/FindPORTAUDIO.cmake
+++ b/cmake/modules/FindPORTAUDIO.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find portaudio
# Find the native PORTAUDIO includes and library
#
diff --git a/cmake/modules/FindSED.cmake b/cmake/modules/FindSED.cmake
index ab1d84b6aa..d0d7c79a98 100644
--- a/cmake/modules/FindSED.cmake
+++ b/cmake/modules/FindSED.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindSETCAP.cmake b/cmake/modules/FindSETCAP.cmake
index 4c77120a6b..1c468bd693 100644
--- a/cmake/modules/FindSETCAP.cmake
+++ b/cmake/modules/FindSETCAP.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Look for the Linux setcap command (capabilities)
#
diff --git a/cmake/modules/FindSH.cmake b/cmake/modules/FindSH.cmake
index 83032a731f..75867af495 100644
--- a/cmake/modules/FindSH.cmake
+++ b/cmake/modules/FindSH.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindSMI.cmake b/cmake/modules/FindSMI.cmake
index a483ebf051..8a6c27eade 100644
--- a/cmake/modules/FindSMI.cmake
+++ b/cmake/modules/FindSMI.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find smi
# Find the native SMI includes and library
#
diff --git a/cmake/modules/FindWSWinLibs.cmake b/cmake/modules/FindWSWinLibs.cmake
index 03c384abfa..4d970f9ef4 100644
--- a/cmake/modules/FindWSWinLibs.cmake
+++ b/cmake/modules/FindWSWinLibs.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find WSWin Libs
# Due to the layout of the Wireshark Win support libs,
# CMake needs some support to find them
diff --git a/cmake/modules/FindXMLLINT.cmake b/cmake/modules/FindXMLLINT.cmake
index 583868050a..718097b0ee 100644
--- a/cmake/modules/FindXMLLINT.cmake
+++ b/cmake/modules/FindXMLLINT.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake
index 2b00bd9d86..abaade8854 100644
--- a/cmake/modules/FindXSLTPROC.cmake
+++ b/cmake/modules/FindXSLTPROC.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake
index 1f374d274a..17b56417b4 100644
--- a/cmake/modules/FindYACC.cmake
+++ b/cmake/modules/FindYACC.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindYAPP.cmake b/cmake/modules/FindYAPP.cmake
index 3b38fa4c1a..48b0c65f9d 100644
--- a/cmake/modules/FindYAPP.cmake
+++ b/cmake/modules/FindYAPP.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake
index 0e6c4a384e..0faf7aa1b9 100644
--- a/cmake/modules/FindZLIB.cmake
+++ b/cmake/modules/FindZLIB.cmake
@@ -1,7 +1,5 @@
# - Find zlib
#
-# $Id$
-#
# Find the native ZLIB includes and library.
# Once done this will define
#
diff --git a/cmake/modules/UseABICheck.cmake b/cmake/modules/UseABICheck.cmake
index cc2d8d484a..061bc77bb7 100644
--- a/cmake/modules/UseABICheck.cmake
+++ b/cmake/modules/UseABICheck.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# ABI Check related macros
#
# ABI compliance checker can be obtained from
diff --git a/cmake/modules/UseAsn2Wrs.cmake b/cmake/modules/UseAsn2Wrs.cmake
index 8fe90e25a3..6d8cae861e 100644
--- a/cmake/modules/UseAsn2Wrs.cmake
+++ b/cmake/modules/UseAsn2Wrs.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
MACRO(ASN2WRS)
set( DISSECTOR ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-${PROTOCOL_NAME}.c )
diff --git a/cmake/modules/UseCheckAPI.cmake b/cmake/modules/UseCheckAPI.cmake
index 88ab583e42..db830a5e86 100644
--- a/cmake/modules/UseCheckAPI.cmake
+++ b/cmake/modules/UseCheckAPI.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
macro( CHECKAPI )
set( _sources ${ARGN} )
diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake
index f0ac09d08b..1aa2f85a51 100644
--- a/cmake/modules/UseLemon.cmake
+++ b/cmake/modules/UseLemon.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
MACRO(ADD_LEMON_FILES _sources )
set(_lemonpardir ${CMAKE_SOURCE_DIR}/tools/lemon)
FOREACH (_current_FILE ${ARGN})
diff --git a/cmake/modules/UseMakeDissectorReg.cmake b/cmake/modules/UseMakeDissectorReg.cmake
index c39825c3a0..c17dfe472c 100644
--- a/cmake/modules/UseMakeDissectorReg.cmake
+++ b/cmake/modules/UseMakeDissectorReg.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
MACRO(REGISTER_DISSECTOR_FILES _outputfile _registertype )
if(${_registertype} STREQUAL "dissectors" )
set( _makeregistertype "dissectorsinfile" )
diff --git a/cmake/modules/UseMakeTapReg.cmake b/cmake/modules/UseMakeTapReg.cmake
index bb41c80d99..1242d844c1 100644
--- a/cmake/modules/UseMakeTapReg.cmake
+++ b/cmake/modules/UseMakeTapReg.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
MACRO(REGISTER_TAP_FILES _outputfile _registertype )
set( _sources ${ARGN})
ADD_CUSTOM_COMMAND(
diff --git a/cmake/modules/UseWinLibs.cmake b/cmake/modules/UseWinLibs.cmake
index 1e8db30389..90957abb3f 100644
--- a/cmake/modules/UseWinLibs.cmake
+++ b/cmake/modules/UseWinLibs.cmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Right now this is a more or less inelegant hack to get Windows
# builds going with MSVC
diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index 442b50f8e5..e4eec87037 100644
--- a/codecs/CMakeLists.txt
+++ b/codecs/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/codecs/Makefile.am b/codecs/Makefile.am
index 1ce407f129..4ae0c5516f 100644
--- a/codecs/Makefile.am
+++ b/codecs/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for the libcodec library for Wireshark
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/codecs/Makefile.common b/codecs/Makefile.common
index 7f35b87d2e..fc76046c34 100644
--- a/codecs/Makefile.common
+++ b/codecs/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake
index 7d5f8a7442..82470df1f6 100644
--- a/codecs/Makefile.nmake
+++ b/codecs/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building codecs.lib with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\config.nmake
include ..\Makefile.nmake.inc
diff --git a/config.nmake b/config.nmake
index d0f55296c9..b3dff9facf 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,5 +1,3 @@
-# $Id$
-
# Some more information about the settings in this file can be found in
# the file README.windows and the Developer's Guide (available online).
diff --git a/debian/wireshark-root.desktop b/debian/wireshark-root.desktop
index ef7002412e..a94bbad2c6 100644
--- a/debian/wireshark-root.desktop
+++ b/debian/wireshark-root.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-# $Id$
# The format of this file is specified at
# http://freedesktop.org/Standards/desktop-entry-spec
# The entries are in the order they are listed in version 1.0
diff --git a/debian/wireshark.desktop b/debian/wireshark.desktop
index 78c0e7b86c..189aee0176 100644
--- a/debian/wireshark.desktop
+++ b/debian/wireshark.desktop
@@ -1,6 +1,4 @@
[Desktop Entry]
-# $Id$
-# The format of this file is specified at
# http://freedesktop.org/Standards/desktop-entry-spec
# The entries are in the order they are listed in version 1.0
Type=Application
diff --git a/diameter/Custom.make b/diameter/Custom.make
index abd28aa5e4..30b607448e 100644
--- a/diameter/Custom.make
+++ b/diameter/Custom.make
@@ -1,6 +1,6 @@
-# $Id$
+#
# Add custom dictionaries here as:
# diameter/foo.xml
#
-_CUSTOM_diameter_xml_files_ = \ No newline at end of file
+_CUSTOM_diameter_xml_files_ =
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 2fb6818720..c897538cb0 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/docbook/Makefile.am b/docbook/Makefile.am
index d961786361..9d8c45fb74 100644
--- a/docbook/Makefile.am
+++ b/docbook/Makefile.am
@@ -3,8 +3,6 @@
# in several formats.
# See the Readme.txt file for instructions.
#
-# $Id$
-#
# formatting objects processor
# Additional options to fop.
diff --git a/docbook/Makefile.common b/docbook/Makefile.common
index 23b5eae27d..032fe1fcf5 100644
--- a/docbook/Makefile.common
+++ b/docbook/Makefile.common
@@ -1,6 +1,4 @@
#
-# $Id$
-#
WSUG_FILES = \
wsug_src/WSUG_app_files.xml \
wsug_src/WSUG_app_howitworks.xml \
diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake
index ec48569273..a9f179a7b4 100644
--- a/docbook/Makefile.nmake
+++ b/docbook/Makefile.nmake
@@ -5,8 +5,6 @@
#
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake [target ...]
#
-# $Id$
-#
############### YOU SHOULDN'T HAVE TO EDIT ANYTHING BELOW THIS LINE! ################
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index 4b76fbc7d5..c55c6e9f2e 100644
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -1,5 +1,4 @@
# AsciiDoc configuration for Wireshark
-# $Id$
[replacements]
diff --git a/docbook/check_git_version.sh b/docbook/check_git_version.sh
index 5c5a51f245..b1ef85892a 100755
--- a/docbook/check_git_version.sh
+++ b/docbook/check_git_version.sh
@@ -2,8 +2,6 @@
#
# Check for Git version
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/docbook/dfilter2xml.pl b/docbook/dfilter2xml.pl
index ed0ee4810b..72a10ec2eb 100755
--- a/docbook/dfilter2xml.pl
+++ b/docbook/dfilter2xml.pl
@@ -11,8 +11,6 @@
#
# Gilbert Ramirez <gram [AT] alumni.rice.edu>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/docbook/make-wsluarm.pl b/docbook/make-wsluarm.pl
index d550c1b254..c6fa9cfec9 100755
--- a/docbook/make-wsluarm.pl
+++ b/docbook/make-wsluarm.pl
@@ -5,8 +5,6 @@
#
# (c) 2006, Luis E. Garcia Onatnon <luis@ontanon.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/doxygen.cfg.in b/doxygen.cfg.in
index cc43eea109..307f82fe25 100644
--- a/doxygen.cfg.in
+++ b/doxygen.cfg.in
@@ -1,6 +1,4 @@
-# $Id$
# @configure_input@
-
@INCLUDE = doxygen_global.cfg
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
diff --git a/echld/CMakeLists.txt b/echld/CMakeLists.txt
index 0637809133..a7e3701be4 100644
--- a/echld/CMakeLists.txt
+++ b/echld/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/echld/Makefile.am b/echld/Makefile.am
index 11e90dc565..f842243ca7 100644
--- a/echld/Makefile.am
+++ b/echld/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/echld/Makefile.common b/echld/Makefile.common
index bcba50a851..6bd5a8b341 100644
--- a/echld/Makefile.common
+++ b/echld/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/echld/Makefile.nmake b/echld/Makefile.nmake
index bfa73d4230..d82c00312e 100644
--- a/echld/Makefile.nmake
+++ b/echld/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\config.nmake
include <win32.mak>
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 5aa75f7efd..9da01bf1ab 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 518ada561e..259f42e3af 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -3,8 +3,6 @@
# (EPAN is a historical name; it stands for Ethereal Protocol ANalyzer
# Library)
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/Makefile.common b/epan/Makefile.common
index a996728b9b..08f6629ad3 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 0e214ee979..b5d7681996 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\config.nmake
include <win32.mak>
diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am
index 82bb91e06b..091c8d2946 100644
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for the airpdcap for Wireshark
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/crypt/Makefile.common b/epan/crypt/Makefile.common
index 8b4bda7939..18e8edee5d 100644
--- a/epan/crypt/Makefile.common
+++ b/epan/crypt/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/crypt/Makefile.nmake b/epan/crypt/Makefile.nmake
index 61bb25f4bc..b580c48b7b 100644
--- a/epan/crypt/Makefile.nmake
+++ b/epan/crypt/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building airpdcap.lib with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
include Makefile.common
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 438a5aa197..b851e94d10 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2001 Gerald Combs
diff --git a/epan/dfilter/Makefile.common b/epan/dfilter/Makefile.common
index 4b139dc41a..66516ea1b7 100644
--- a/epan/dfilter/Makefile.common
+++ b/epan/dfilter/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index eb2b45f6d1..8eda89000e 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 6b6fa11659..c2a3175967 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 5349e90091..67fa181a4d 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 6e4df3adf9..c56f61339d 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
diff --git a/epan/dissectors/dcerpc/CMakeLists.txt b/epan/dissectors/dcerpc/CMakeLists.txt
index 8be363df16..6d8708b95b 100644
--- a/epan/dissectors/dcerpc/CMakeLists.txt
+++ b/epan/dissectors/dcerpc/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/dissectors/dcerpc/Makefile.am b/epan/dissectors/dcerpc/Makefile.am
index 96b2be1959..44cd795b62 100644
--- a/epan/dissectors/dcerpc/Makefile.am
+++ b/epan/dissectors/dcerpc/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
diff --git a/epan/dissectors/dcerpc/Makefile.inc b/epan/dissectors/dcerpc/Makefile.inc
index 477b9def85..4832496d67 100644
--- a/epan/dissectors/dcerpc/Makefile.inc
+++ b/epan/dissectors/dcerpc/Makefile.inc
@@ -1,5 +1,3 @@
-# $Id$
-
IDL2WRS=../idl2wrs
DISSECTOR_FILES=packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h
diff --git a/epan/dissectors/dcerpc/budb/Makefile b/epan/dissectors/dcerpc/budb/Makefile
index 6d0b93282f..9f0803e53e 100644
--- a/epan/dissectors/dcerpc/budb/Makefile
+++ b/epan/dissectors/dcerpc/budb/Makefile
@@ -1,4 +1,2 @@
-# $Id$
-
PROTOCOL_NAME=budb
include ../Makefile.inc
diff --git a/epan/dissectors/dcerpc/butc/Makefile b/epan/dissectors/dcerpc/butc/Makefile
index 490be0085a..895e2d8aa5 100644
--- a/epan/dissectors/dcerpc/butc/Makefile
+++ b/epan/dissectors/dcerpc/butc/Makefile
@@ -1,4 +1,2 @@
-# $Id$
-
PROTOCOL_NAME=butc
include ../Makefile.inc
diff --git a/epan/dissectors/dcerpc/drsuapi/Makefile b/epan/dissectors/dcerpc/drsuapi/Makefile
index 4ce70f9937..0efc4a2df9 100644
--- a/epan/dissectors/dcerpc/drsuapi/Makefile
+++ b/epan/dissectors/dcerpc/drsuapi/Makefile
@@ -1,4 +1,2 @@
-# $Id$
-
PROTOCOL_NAME=drsuapi
include ../Makefile.inc
diff --git a/epan/dissectors/pidl/Makefile.am b/epan/dissectors/pidl/Makefile.am
index dc267c09f3..a15ad2023e 100644
--- a/epan/dissectors/pidl/Makefile.am
+++ b/epan/dissectors/pidl/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
diff --git a/epan/dissectors/pidl/srvsvc.cnf b/epan/dissectors/pidl/srvsvc.cnf
index 3e4e15e896..ed7c719574 100644
--- a/epan/dissectors/pidl/srvsvc.cnf
+++ b/epan/dissectors/pidl/srvsvc.cnf
@@ -1,7 +1,5 @@
# conformance file for SRVSVC
#
-# $Id$
-#
MANUAL srvsvc_dissect_element_NetShareInfo_info1501_
MANUAL srvsvc_dissect_element_NetGetFileSecurity_sd_buf_
diff --git a/epan/dissectors/x11-fields b/epan/dissectors/x11-fields
index 67ce035bdc..7d02353532 100644
--- a/epan/dissectors/x11-fields
+++ b/epan/dissectors/x11-fields
@@ -3,8 +3,6 @@
#
# Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/doxygen.cfg.in b/epan/doxygen.cfg.in
index cb34de888c..4df7ffda11 100644
--- a/epan/doxygen.cfg.in
+++ b/epan/doxygen.cfg.in
@@ -1,4 +1,3 @@
-# $Id$
# @configure_input@
@INCLUDE = ../doxygen_global.cfg
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index 43e5060562..04f344c36a 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/ftypes/Makefile.common b/epan/ftypes/Makefile.common
index 14203ac071..222949b8bb 100644
--- a/epan/ftypes/Makefile.common
+++ b/epan/ftypes/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index ec28e8ed65..aefc3f17f6 100644
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am
index de37727a1e..e06d72a4cd 100644
--- a/epan/wmem/Makefile.am
+++ b/epan/wmem/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for Wireshark Memory Manager
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/wmem/Makefile.common b/epan/wmem/Makefile.common
index 47df89be9b..20cd8a66e4 100644
--- a/epan/wmem/Makefile.common
+++ b/epan/wmem/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/wmem/Makefile.nmake b/epan/wmem/Makefile.nmake
index d5469d4605..e607cb3a23 100644
--- a/epan/wmem/Makefile.nmake
+++ b/epan/wmem/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wmem.lib with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
include Makefile.common
diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index a9c676ef6b..8707eaa67b 100644
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index 27dd367e6f..9c97f0b9b7 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake
index b8b96cdf5c..7e3c60ed2e 100644
--- a/epan/wslua/Makefile.nmake
+++ b/epan/wslua/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ..\..\config.nmake
diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl
index 47ffbf221f..328dd9fc92 100755
--- a/epan/wslua/make-init-lua.pl
+++ b/epan/wslua/make-init-lua.pl
@@ -6,8 +6,6 @@
#
# (c) 2006, Luis E. Garcia Onatnon <luis@ontanon.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
diff --git a/epan/wslua/make-reg.pl b/epan/wslua/make-reg.pl
index 1eeb167e9a..52af54c817 100755
--- a/epan/wslua/make-reg.pl
+++ b/epan/wslua/make-reg.pl
@@ -5,8 +5,6 @@
#
# (c) 2006, Luis E. Garcia Onatnon <luis.ontanon@gmail.com>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/wslua/make-taps.pl b/epan/wslua/make-taps.pl
index 7ab596ac31..0c7327fdcb 100755
--- a/epan/wslua/make-taps.pl
+++ b/epan/wslua/make-taps.pl
@@ -7,8 +7,6 @@
#
# (c) 2006 Luis E. Garcia Ontanon <luis@ontanon.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2006 Gerald Combs
diff --git a/epan/wslua/taps b/epan/wslua/taps
index 7cf98a36c0..56f4242a5b 100644
--- a/epan/wslua/taps
+++ b/epan/wslua/taps
@@ -3,8 +3,6 @@
#
# (c) 2006 Luis E. Garcia Ontanon <luis@ontanon.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2006 Gerald Combs
diff --git a/epan/wspython/CMakeLists.txt b/epan/wspython/CMakeLists.txt
index ef565baa38..4a23c7ea50 100644
--- a/epan/wspython/CMakeLists.txt
+++ b/epan/wspython/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/wspython/Makefile.am b/epan/wspython/Makefile.am
index 3a3ee2ec2f..43613b1014 100644
--- a/epan/wspython/Makefile.am
+++ b/epan/wspython/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/wspython/Makefile.common b/epan/wspython/Makefile.common
index c4eb36f20d..c0c54033f8 100644
--- a/epan/wspython/Makefile.common
+++ b/epan/wspython/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/epan/wspython/Makefile.nmake b/epan/wspython/Makefile.nmake
index 67522e1157..94be104939 100644
--- a/epan/wspython/Makefile.nmake
+++ b/epan/wspython/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ..\..\config.nmake
include Makefile.common
diff --git a/epan/wspython/register-dissector.py b/epan/wspython/register-dissector.py
index c67ae6f7e7..85cf3e794b 100755
--- a/epan/wspython/register-dissector.py
+++ b/epan/wspython/register-dissector.py
@@ -1,7 +1,5 @@
# register-dissector.py
#
-# $Id$
-#
# Wireshark Protocol Python Binding
#
# Copyright (c) 2009 by Sebastien Tandel <sebastien [AT] tandel [dot] be>
diff --git a/epan/wspython/wspy_dissector.py b/epan/wspython/wspy_dissector.py
index e8993cd13e..e401495ca9 100755
--- a/epan/wspython/wspy_dissector.py
+++ b/epan/wspython/wspy_dissector.py
@@ -1,7 +1,5 @@
# wspy_dissector.py
#
-# $Id$
-#
# Wireshark Protocol Python Binding
#
# Copyright (c) 2009 by Sebastien Tandel <sebastien [AT] tandel [dot] be>
diff --git a/epan/wspython/wspy_libws.py b/epan/wspython/wspy_libws.py
index 48e15fff8b..beec155fa1 100755
--- a/epan/wspython/wspy_libws.py
+++ b/epan/wspython/wspy_libws.py
@@ -1,7 +1,5 @@
# wspy_libws.py
#
-# $Id$
-#
# Wireshark Protocol Python Binding
#
# Copyright (c) 2009 by Sebastien Tandel <sebastien [AT] tandel [dot] be>
diff --git a/filetap/CMakeLists.txt b/filetap/CMakeLists.txt
index 34df8c39ba..82001b0eaa 100644
--- a/filetap/CMakeLists.txt
+++ b/filetap/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/filetap/Makefile.am b/filetap/Makefile.am
index f508bc48e7..37896207f9 100644
--- a/filetap/Makefile.am
+++ b/filetap/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for Filetap
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/filetap/Makefile.common b/filetap/Makefile.common
index 7988028e86..50a65c8761 100644
--- a/filetap/Makefile.common
+++ b/filetap/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/filetap/Makefile.nmake b/filetap/Makefile.nmake
index 72d54a3eb3..825db5d26a 100644
--- a/filetap/Makefile.nmake
+++ b/filetap/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ..\config.nmake
include <win32.mak>
diff --git a/help/Makefile.am b/help/Makefile.am
index 11b2f9abaf..1a6937aa27 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for Wireshark help files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2003 Gerald Combs
diff --git a/help/Makefile.nmake b/help/Makefile.nmake
index d8d22178e7..3eee3bcee7 100644
--- a/help/Makefile.nmake
+++ b/help/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
TOOLS_DIR=..\tools
include ..\config.nmake
diff --git a/help/faq.py b/help/faq.py
index 4d3b3045ef..c76e3ab81a 100755
--- a/help/faq.py
+++ b/help/faq.py
@@ -6,8 +6,6 @@
# Questions and answer content can be found below. Section and
# question numbers will be automatically generated.
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index 2be9aae123..96d832e2fd 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ..\config.nmake
diff --git a/macosx-setup.sh b/macosx-setup.sh
index 8d2985f105..d32827cb18 100755
--- a/macosx-setup.sh
+++ b/macosx-setup.sh
@@ -1,8 +1,6 @@
#!/bin/sh
# Setup development environment on Mac OS X (tested with 10.6.8 and Xcode 3.2.6)
#
-# $Id$
-#
# Copyright 2011 Michael Tuexen, Joerg Mayer, Guy Harris (see AUTHORS file)
#
# Wireshark - Network traffic analyzer
diff --git a/make-version.pl b/make-version.pl
index a0c88d939c..b7ade45097 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -2,8 +2,6 @@
#
# Copyright 2004 Jörg Mayer (see AUTHORS file)
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/manuf b/manuf
index 7ebcd1b0f0..a2ba013989 100644
--- a/manuf
+++ b/manuf
@@ -4,8 +4,6 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id$
-#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
# Wireshark - Network traffic analyzer
@@ -24130,8 +24128,6 @@ FC:FE:77 HitachiR # Hitachi Reftechno, Inc.
#
# Well-known addresses.
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/manuf.tmpl b/manuf.tmpl
index 9f0f0cdac3..c21e9204a4 100644
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -1,8 +1,6 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id$
-#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
# Wireshark - Network traffic analyzer
diff --git a/packaging/Makefile.am b/packaging/Makefile.am
index c1e3207683..bb066dd0ff 100644
--- a/packaging/Makefile.am
+++ b/packaging/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
SUBDIRS = macosx rpm svr4 nsis
MAINTAINERCLEANFILES = \
diff --git a/packaging/Makefile.nmake b/packaging/Makefile.nmake
index a988f3c183..4c090afd59 100644
--- a/packaging/Makefile.nmake
+++ b/packaging/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ../config.nmake
include <win32.mak>
diff --git a/packaging/macosx/ChmodBPF/ChmodBPF b/packaging/macosx/ChmodBPF/ChmodBPF
index 3c1bc7fb73..ba5e49ef92 100755
--- a/packaging/macosx/ChmodBPF/ChmodBPF
+++ b/packaging/macosx/ChmodBPF/ChmodBPF
@@ -1,6 +1,5 @@
#! /bin/bash
#
-# $Id$
. /etc/rc.common
diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am
index 791f0b793c..0889ee2431 100644
--- a/packaging/macosx/Makefile.am
+++ b/packaging/macosx/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# This was disabled at one point, since the contents of the
# Clearlooks-Quicksilver-OSX directory exceed the 99-character file
# name limit imposed by the old tar format. We now use ustar format,
diff --git a/packaging/macosx/Resources/bin/getdisplay.sh b/packaging/macosx/Resources/bin/getdisplay.sh
index 085ac2be78..f7f3833487 100755
--- a/packaging/macosx/Resources/bin/getdisplay.sh
+++ b/packaging/macosx/Resources/bin/getdisplay.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Author: Aaron Voisine <aaron@voisine.org>
if [ "$DISPLAY"x == "x" ]; then
diff --git a/packaging/macosx/Resources/bin/wireshark b/packaging/macosx/Resources/bin/wireshark
index 0db6b8cf11..5279a1e92c 100755
--- a/packaging/macosx/Resources/bin/wireshark
+++ b/packaging/macosx/Resources/bin/wireshark
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Author: Aaron Voisine <aaron@voisine.org>
# Wireshark Modifications:
# Michael Wybrow <mjwybrow@users.sourceforge.net>
diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc
index 588ee37b78..547889723b 100755
--- a/packaging/macosx/Resources/openDoc
+++ b/packaging/macosx/Resources/openDoc
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Author: Aaron Voisine <aaron@voisine.org>
# Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net>
diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script
index f263323957..ff35f1a76a 100755
--- a/packaging/macosx/Resources/script
+++ b/packaging/macosx/Resources/script
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Author: Aaron Voisine <aaron@voisine.org>
# Wireshark (Inkscape) Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net>
diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh
index 884de3ac3a..12f8520f60 100755
--- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh
+++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh
@@ -1,7 +1,5 @@
#!/bin/bash
#
-# $Id$
-
cp -f slider-vert.png slider-vert-prelight.png
cp -f slider-vert.png slider-horiz-prelight.png
cp -f slider-vert.png slider-horiz.png
diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh
index 884de3ac3a..12f8520f60 100755
--- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh
+++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh
@@ -1,7 +1,5 @@
#!/bin/bash
#
-# $Id$
-
cp -f slider-vert.png slider-vert-prelight.png
cp -f slider-vert.png slider-horiz-prelight.png
cp -f slider-vert.png slider-horiz.png
diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc
index 00dc712e87..28321bbc65 100644
--- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc
+++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc
@@ -1,8 +1,6 @@
#
# GTK theme to be used on Mac OS X, to mimic the appearance of Tiger
#
-# $Id$
-#
# Heavily based on Clearlooks-Quicksilver
# Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com)
#
diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
index 595a022a94..2c806d36c5 100644
--- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
+++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
@@ -1,8 +1,6 @@
#
# GTK theme to be used on Mac OS X, to mimic the appearance of Tiger
#
-# $Id$
-#
# Heavily based on Clearlooks-Quicksilver
# Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com)
#
diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh
index 7dbfc7d0ff..f809e4c506 100755
--- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh
+++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Reads defaults from Apple preferences and modifies GTK accordingly
#
# (c) 2007 JiHO <jo.irisson@gmail.com>
diff --git a/packaging/macosx/ScriptExec/openDoc b/packaging/macosx/ScriptExec/openDoc
index faf016d011..638dfb9848 100755
--- a/packaging/macosx/ScriptExec/openDoc
+++ b/packaging/macosx/ScriptExec/openDoc
@@ -1,6 +1,4 @@
#!/bin/sh
#
-# $Id$
-
echo $1;
diff --git a/packaging/macosx/ScriptExec/script b/packaging/macosx/ScriptExec/script
index faf016d011..638dfb9848 100755
--- a/packaging/macosx/ScriptExec/script
+++ b/packaging/macosx/ScriptExec/script
@@ -1,6 +1,4 @@
#!/bin/sh
#
-# $Id$
-
echo $1;
diff --git a/packaging/macosx/native-gtk/build-gtk.sh b/packaging/macosx/native-gtk/build-gtk.sh
index c4373cb9ff..8cc870670a 100755
--- a/packaging/macosx/native-gtk/build-gtk.sh
+++ b/packaging/macosx/native-gtk/build-gtk.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Based on the Imendio 'build-gtk.sh' script.
#
# Inkscape (Wireshark) build additions by Michael Wybrow <mjwybrow@users.sf.net>
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 3db8fb5f47..be6d1fc7e0 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -1,7 +1,5 @@
#!/bin/bash
#
-# $Id$
-#
# USAGE
# osx-app [-s] [-l /path/to/libraries] -bp /path/to/wireshark/bin -p /path/to/Info.plist
#
diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in
index da2686f447..1f390ac71a 100755
--- a/packaging/macosx/osx-dmg.sh.in
+++ b/packaging/macosx/osx-dmg.sh.in
@@ -1,7 +1,5 @@
#!/bin/bash
#
-# $Id$
-#
# USAGE
# osx-dmg [-s] -p /path/to/Wireshark.app
#
diff --git a/packaging/macosx/utility-launcher/wireshark b/packaging/macosx/utility-launcher/wireshark
index e8667a18e8..e412a5024c 100755
--- a/packaging/macosx/utility-launcher/wireshark
+++ b/packaging/macosx/utility-launcher/wireshark
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Wireshark CLI utility launcher
if [ -z "$WIRESHARK_APP_DIR" ] ; then
diff --git a/packaging/nsis/Custom.nmake b/packaging/nsis/Custom.nmake
index bac8ffbcbb..49979f9367 100644
--- a/packaging/nsis/Custom.nmake
+++ b/packaging/nsis/Custom.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Add your custom plugins here
CUSTOM_PLUGINS= \
# Example:
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index c5e8509cba..1d4cdf4f1b 100644
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
MAINTAINERCLEANFILES = \
Makefile.in
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 166d833483..ae9a144fc3 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# NSIS is a free packager/installer/uninstaller program for Win32.
# It was originally written for the Winamp package, but various
# freeware and non-freeware packages are using it, too.
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake
index 41501b8d77..ddaa092d8e 100644
--- a/packaging/portableapps/win32/Makefile.nmake
+++ b/packaging/portableapps/win32/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ../../../config.nmake
include <win32.mak>
diff --git a/packaging/portableapps/win32/WiresharkPortable.tmpl b/packaging/portableapps/win32/WiresharkPortable.tmpl
index 57b19e7fe7..6e26dd1395 100644
--- a/packaging/portableapps/win32/WiresharkPortable.tmpl
+++ b/packaging/portableapps/win32/WiresharkPortable.tmpl
@@ -1,8 +1,6 @@
#
# WirersharkPortable.ini - settings for configure the running of WiresharkPortable
#
-# $Id$
-#
[WiresharkPortable]
WiresharkDirectory=App/Wireshark
diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl
index 0951a62900..47dc8a5e2c 100755
--- a/packaging/portableapps/win32/makenmake.pl
+++ b/packaging/portableapps/win32/makenmake.pl
@@ -1,7 +1,5 @@
#
# makenmake.pl - create a nmake file from a generic manifest file that will create the appropriate PortableApp structure
-# $Id$
-#
print q{
#
diff --git a/packaging/rpm/Makefile.am b/packaging/rpm/Makefile.am
index 09d50f4cee..0ebfb7f1b1 100644
--- a/packaging/rpm/Makefile.am
+++ b/packaging/rpm/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
SUBDIRS = SPECS
MAINTAINERCLEANFILES = \
diff --git a/packaging/rpm/SPECS/Makefile.am b/packaging/rpm/SPECS/Makefile.am
index fe34256d57..71179fac5e 100644
--- a/packaging/rpm/SPECS/Makefile.am
+++ b/packaging/rpm/SPECS/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
MAINTAINERCLEANFILES = \
Makefile.in
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index 043d3333b4..ad292122eb 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -1,5 +1,4 @@
# Note that this is NOT a relocatable package
-# $Id$
# @configure_input@
# configure options: @CONFIG_ARGS@
diff --git a/packaging/svr4/Makefile.am b/packaging/svr4/Makefile.am
index afcf9e2bfa..83538f1dce 100644
--- a/packaging/svr4/Makefile.am
+++ b/packaging/svr4/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
DISTCLEANFILES = \
Prototype
diff --git a/packaging/svr4/checkinstall.in b/packaging/svr4/checkinstall.in
index e8afe11fb9..8cd0de78ba 100755
--- a/packaging/svr4/checkinstall.in
+++ b/packaging/svr4/checkinstall.in
@@ -6,8 +6,6 @@
# This is a modified version of a script written by mark@metalab.unc.edu .
# The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html .
#
-# $Id$
-#
PKG_CONFIG=@PKG_CONFIG@
diff --git a/packaging/svr4/mkpkg b/packaging/svr4/mkpkg
index ecd908ee79..ceb762a6d7 100755
--- a/packaging/svr4/mkpkg
+++ b/packaging/svr4/mkpkg
@@ -6,8 +6,6 @@
# This is a modified version of a script written by mark@metalab.unc.edu .
# The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html .
#
-# $Id$
-#
if [ "$1" != "" ] ; then
pkg=$1
else
diff --git a/packaging/svr4/pkginfo.in b/packaging/svr4/pkginfo.in
index 065f02b284..0c3edf2eee 100644
--- a/packaging/svr4/pkginfo.in
+++ b/packaging/svr4/pkginfo.in
@@ -1,4 +1,3 @@
-# $Id$
# @configure_input@
PKG="@PACKAGE@"
NAME="@PACKAGE@ @VERSION@"
diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl
index 632f2e7304..41a0fbba9e 100755
--- a/packaging/ws-manifest.pl
+++ b/packaging/ws-manifest.pl
@@ -1,7 +1,5 @@
#
# ws-manifest.pl - create a generic manifest file (including u3 information) from the wireshark.nsi
-# $Id$
-#
# These are the known directories in the distribution and where they should live on a U3 device
diff --git a/plugins/Custom.m4.example b/plugins/Custom.m4.example
index 0694d281eb..a124cb525e 100644
--- a/plugins/Custom.m4.example
+++ b/plugins/Custom.m4.example
@@ -1,5 +1,3 @@
#
-# $Id$
-#
m4_define([_CUSTOM_AC_OUTPUT_], [plugins/foo/Makefile])
diff --git a/plugins/Custom.make.example b/plugins/Custom.make.example
index ecb0f171bc..dec58c8288 100644
--- a/plugins/Custom.make.example
+++ b/plugins/Custom.make.example
@@ -1,6 +1,4 @@
#
-# $Id$
-#
_CUSTOM_SUBDIRS_ = \
foo
diff --git a/plugins/Custom.nmake.example b/plugins/Custom.nmake.example
index 1d9c153940..ef1b73f37b 100644
--- a/plugins/Custom.nmake.example
+++ b/plugins/Custom.nmake.example
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ..\config.nmake
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index fbabf1b26f..0cca3cd198 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for Wireshark plugins
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/Makefile.common.inc b/plugins/Makefile.common.inc
index 80915cc5ea..e60ce88238 100644
--- a/plugins/Makefile.common.inc
+++ b/plugins/Makefile.common.inc
@@ -1,8 +1,6 @@
#
# Common definitions for plugin Makefile.common files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 1d073a8132..2bf5a9cb8c 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ..\config.nmake
diff --git a/plugins/asn1/CMakeLists.txt b/plugins/asn1/CMakeLists.txt
index 6485d263cc..d7cebba76f 100644
--- a/plugins/asn1/CMakeLists.txt
+++ b/plugins/asn1/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
index 873c6e46a9..a44756eb7d 100644
--- a/plugins/asn1/Makefile.am
+++ b/plugins/asn1/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for ASN.1 plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/asn1/Makefile.common b/plugins/asn1/Makefile.common
index 95775d925e..c24fc7a33f 100644
--- a/plugins/asn1/Makefile.common
+++ b/plugins/asn1/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index b3a64f884c..678ddb88bf 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for ASN.1 plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/asn1/moduleinfo.nmake b/plugins/asn1/moduleinfo.nmake
index a1ae6e447a..109a0827c9 100644
--- a/plugins/asn1/moduleinfo.nmake
+++ b/plugins/asn1/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=asn1
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt
index 6eca55980c..7a26e5f788 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/docsis/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 308fe5af08..3dbc884072 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for DOCSIS plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/docsis/Makefile.common b/plugins/docsis/Makefile.common
index 6c133c76dc..8849d1e575 100644
--- a/plugins/docsis/Makefile.common
+++ b/plugins/docsis/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 96ce4145a9..93331e7e1d 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for DOCSIS plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/docsis/moduleinfo.nmake b/plugins/docsis/moduleinfo.nmake
index a0d54a2dd5..99580abefd 100644
--- a/plugins/docsis/moduleinfo.nmake
+++ b/plugins/docsis/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=docsis
diff --git a/plugins/easy_codec/Makefile.common b/plugins/easy_codec/Makefile.common
index 9c80afeac3..3fd0ac602c 100644
--- a/plugins/easy_codec/Makefile.common
+++ b/plugins/easy_codec/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake
index ccbbcb4955..5b907f3239 100644
--- a/plugins/easy_codec/Makefile.nmake
+++ b/plugins/easy_codec/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for Easy codec plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/easy_codec/moduleinfo.nmake b/plugins/easy_codec/moduleinfo.nmake
index 1f442288f9..2746c3d448 100644
--- a/plugins/easy_codec/moduleinfo.nmake
+++ b/plugins/easy_codec/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=codec_test
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt
index 9f32bf01aa..50a0687537 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/ethercat/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am
index 544ee4f59f..06f2dcab96 100644
--- a/plugins/ethercat/Makefile.am
+++ b/plugins/ethercat/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for EtherCAT plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/ethercat/Makefile.common b/plugins/ethercat/Makefile.common
index d5ac1dbccd..6a39cff77d 100644
--- a/plugins/ethercat/Makefile.common
+++ b/plugins/ethercat/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake
index 75486808e2..fa4542afb9 100644
--- a/plugins/ethercat/Makefile.nmake
+++ b/plugins/ethercat/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for EtherCAT plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/ethercat/moduleinfo.nmake b/plugins/ethercat/moduleinfo.nmake
index 51fcc8217d..800f0f4ea6 100644
--- a/plugins/ethercat/moduleinfo.nmake
+++ b/plugins/ethercat/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=ethercat
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt
index 67652a6d2e..d80b0ccfd1 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/gryphon/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index df171466d9..85215c48e6 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -3,8 +3,6 @@
# By Steve Limkemann <stevelim@dgtech.com>
# Copyright 1998 Steve Limkemann
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/gryphon/Makefile.common b/plugins/gryphon/Makefile.common
index b5d091092f..52958ec54b 100644
--- a/plugins/gryphon/Makefile.common
+++ b/plugins/gryphon/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index f64b114e33..a652e83f55 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for Gryphon plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/gryphon/moduleinfo.nmake b/plugins/gryphon/moduleinfo.nmake
index 47f502dbb1..48cb650887 100644
--- a/plugins/gryphon/moduleinfo.nmake
+++ b/plugins/gryphon/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=gryphon
diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt
index a15639f632..289865db65 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/irda/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index cfb40869f3..a451446354 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for IrDA plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/irda/Makefile.common b/plugins/irda/Makefile.common
index 9897a2884a..6bc31cd240 100644
--- a/plugins/irda/Makefile.common
+++ b/plugins/irda/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index 114152a3cd..79c2b8f62e 100644
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for Wireshark plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/irda/moduleinfo.nmake b/plugins/irda/moduleinfo.nmake
index edf0f9751d..6696416496 100644
--- a/plugins/irda/moduleinfo.nmake
+++ b/plugins/irda/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=irda
diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt
index e0d6cc97ed..3020afd31c 100644
--- a/plugins/m2m/CMakeLists.txt
+++ b/plugins/m2m/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am
index d0e4545c61..d582ce644a 100644
--- a/plugins/m2m/Makefile.am
+++ b/plugins/m2m/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for M2M plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/m2m/Makefile.common b/plugins/m2m/Makefile.common
index 677e3f448d..4070690d38 100644
--- a/plugins/m2m/Makefile.common
+++ b/plugins/m2m/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake
index a56803ef10..9e06f165a1 100644
--- a/plugins/m2m/Makefile.nmake
+++ b/plugins/m2m/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for M2M plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/m2m/moduleinfo.nmake b/plugins/m2m/moduleinfo.nmake
index bafbb1588f..2a7289d77d 100644
--- a/plugins/m2m/moduleinfo.nmake
+++ b/plugins/m2m/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=m2m
diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index 5220bf3f36..1f6d5616eb 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 3f0a59eb95..4ccd3ea469 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for MATE Wireshark plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/mate/Makefile.common b/plugins/mate/Makefile.common
index b59ee8793a..4395d23acb 100644
--- a/plugins/mate/Makefile.common
+++ b/plugins/mate/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index f16846b0b2..48fcaf39f7 100644
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for mate plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/mate/examples/call.mate b/plugins/mate/examples/call.mate
index 8d66610785..0dbbb45ef8 100644
--- a/plugins/mate/examples/call.mate
+++ b/plugins/mate/examples/call.mate
@@ -1,5 +1,4 @@
# call.mate
-# $Id$
Action=Settings; DiscardPduData=TRUE; ShowGopTimes=FALSE; ShowPduTree=FALSE;
diff --git a/plugins/mate/examples/mms.mate b/plugins/mate/examples/mms.mate
index 05bc110c8b..7554b11932 100644
--- a/plugins/mate/examples/mms.mate
+++ b/plugins/mate/examples/mms.mate
@@ -1,5 +1,4 @@
# mms.mate
-# $Id$
# MMSE over HTTP
Action=PduDef; Name=mmse_over_http_pdu; Proto=http; Transport=tcp/ip; Payload=mmse; addr=ip.addr; port=tcp.port; http_rq=http.request; content=http.content_type;
diff --git a/plugins/mate/examples/pasv_ftp.mate b/plugins/mate/examples/pasv_ftp.mate
index 1427f081ae..24ef7ab470 100644
--- a/plugins/mate/examples/pasv_ftp.mate
+++ b/plugins/mate/examples/pasv_ftp.mate
@@ -1,5 +1,5 @@
# pasv_ftp.mate
-# $Id$
+
Action=PduDef; Name=ftp_pdu; Proto=ftp; Transport=tcp/ip; Stop=TRUE; ftp_addr=ip.addr; ftp_port=tcp.port; ftp_resp=ftp.response.code; ftp_req=ftp.request.command; server_addr=ftp.passive.ip; server_port=ftp.passive.port;
Action=PduDef; Name=ftp_data_pdu; Proto=ftp-data; Transport=tcp/ip; server_addr=ip.src; server_port=tcp.srcport;
diff --git a/plugins/mate/examples/tcp.mate b/plugins/mate/examples/tcp.mate
index 3446af48df..2abe3e8882 100644
--- a/plugins/mate/examples/tcp.mate
+++ b/plugins/mate/examples/tcp.mate
@@ -1,5 +1,5 @@
# tcp.mate
-# $Id$
+
Action=PduDef; Name=tcp_pdu; Proto=tcp; Transport=ip; addr=ip.addr; port=tcp.port; tcp_start=tcp.flags.syn; tcp_stop=tcp.flags.fin; tcp_stop=tcp.flags.reset;
Action=GopDef; Name=tcp_session; On=tcp_pdu; addr; addr; port; port;
Action=GopStart; For=tcp_session; tcp_start=1;
diff --git a/plugins/mate/examples/web.mate b/plugins/mate/examples/web.mate
index ae5e20e0b3..fd00c651de 100644
--- a/plugins/mate/examples/web.mate
+++ b/plugins/mate/examples/web.mate
@@ -1,5 +1,4 @@
# web.mate
-# $Id$
Action=PduDef; Name=dns_pdu; Proto=dns; Transport=ip; addr=ip.addr; dns_resp=dns.flags.response; host=dns.qry.name; client_addr=ip.src; dns_id=dns.id;
Action=PduDef; Name=http_pdu; Proto=http; Transport=tcp/ip; addr=ip.addr; port=tcp.port; http_rq=http.request.method; http_rs=http.response; host=http.host; client_addr=ip.src;
diff --git a/plugins/mate/matelib/dns.mate b/plugins/mate/matelib/dns.mate
index f1b07e59d5..be426bc555 100644
--- a/plugins/mate/matelib/dns.mate
+++ b/plugins/mate/matelib/dns.mate
@@ -1,5 +1,4 @@
# dns.mate
-# $Id$
Action=PduDef; Name=dns_pdu; Proto=dns; Transport=udp/ip; addr=ip.addr; port=udp.port; dns_id=dns.id; dns_rsp=dns.flags.response;
Action=GopDef; Name=dns_req; On=dns_pdu; addr; addr; port!53; dns_id;
diff --git a/plugins/mate/matelib/h225_ras.mate b/plugins/mate/matelib/h225_ras.mate
index 299142ccaf..7c6698ef90 100644
--- a/plugins/mate/matelib/h225_ras.mate
+++ b/plugins/mate/matelib/h225_ras.mate
@@ -1,5 +1,4 @@
# h225_ras.mate
-# $Id$
Action=PduDef; Name=ras_pdu; Proto=h225.RasMessage; Transport=udp/ip; ras_sn=h225.requestSeqNum; ras_msg=h225.RasMessage; addr=ip.addr;
Action=GopDef; Name=ras_leg; On=ras_pdu; addr; addr; ras_sn;
diff --git a/plugins/mate/matelib/isup.mate b/plugins/mate/matelib/isup.mate
index e7bad36835..8ff6d3099a 100644
--- a/plugins/mate/matelib/isup.mate
+++ b/plugins/mate/matelib/isup.mate
@@ -1,6 +1,4 @@
# isup.mate
-# $Id$
-
#Action=Transform; Name=isup_msg_type; Mode=Insert; Match=Strict; isup_msg=1; .isup_IAM=;
#Action=Transform; Name=isup_msg_type; Mode=Insert; Match=Strict; isup_msg=2; .isup_SAM=;
diff --git a/plugins/mate/matelib/megaco.mate b/plugins/mate/matelib/megaco.mate
index 861b701fd0..044aba7837 100644
--- a/plugins/mate/matelib/megaco.mate
+++ b/plugins/mate/matelib/megaco.mate
@@ -1,5 +1,4 @@
# megaco.mate
-# $Id$
Action=PduDef; Name=mgc_pdu; Proto=megaco; Transport=ip; addr=ip.addr; megaco_ctx=megaco.context; megaco_trx=megaco.transid; megaco_msg=megaco.transaction; term=megaco.termid;
diff --git a/plugins/mate/matelib/q931.mate b/plugins/mate/matelib/q931.mate
index d14586d96f..5bea5b1a97 100644
--- a/plugins/mate/matelib/q931.mate
+++ b/plugins/mate/matelib/q931.mate
@@ -1,5 +1,4 @@
# q931.thing
-# $Id$
Action=PduDef; Name=q931_pdu; Proto=q931; Stop=TRUE; Transport=tcp/ip; addr=ip.addr; call_ref=q931.call_ref; q931_msg=q931.message_type;
Action=GopDef; Name=q931_leg; On=q931_pdu; addr; addr; call_ref;
diff --git a/plugins/mate/matelib/radius.mate b/plugins/mate/matelib/radius.mate
index 3f69b56ed5..66a910b85e 100644
--- a/plugins/mate/matelib/radius.mate
+++ b/plugins/mate/matelib/radius.mate
@@ -1,5 +1,4 @@
# radius.mate
-# $Id$
Action=Transform; Name=radius_same_port; Mode=Insert; Match=Strict; radius_port; radius_port;
Action=Transform; Name=radius_same_port; Mode=Insert; Match=Every; radius_port; .radius_port=0;
diff --git a/plugins/mate/matelib/rtsp.mate b/plugins/mate/matelib/rtsp.mate
index 34c28b7921..35f25ab246 100644
--- a/plugins/mate/matelib/rtsp.mate
+++ b/plugins/mate/matelib/rtsp.mate
@@ -1,5 +1,4 @@
# rtsp.mate
-# $Id$
Action=PduDef; Name=rtsp_pdu; Proto=rtsp; Transport=tcp/ip; addr=ip.addr; port=tcp.port; rtsp_method=rtsp.method;
Action=PduExtra; For=rtsp_pdu; rtsp_ses=rtsp.session; rtsp_url=rtsp.url;
diff --git a/plugins/mate/matelib/sip.mate b/plugins/mate/matelib/sip.mate
index f77cdec9f8..593c915b06 100644
--- a/plugins/mate/matelib/sip.mate
+++ b/plugins/mate/matelib/sip.mate
@@ -1,5 +1,4 @@
# sip.mate
-# $Id$
Action=PduDef; Name=sip_pdu; Proto=sip; Transport=tcp/ip; addr=ip.addr; port=tcp.port; sip_method=sip.Method; sip_callid=sip.Call-ID; calling=sdp.owner.username;
Action=GopDef; Name=sip_leg; On=sip_pdu; addr; addr; port; port;
diff --git a/plugins/mate/moduleinfo.nmake b/plugins/mate/moduleinfo.nmake
index eb82b7fb05..8ae3a8d706 100644
--- a/plugins/mate/moduleinfo.nmake
+++ b/plugins/mate/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=mate
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt
index cdbd070eb5..02eaf0172e 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/opcua/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am
index 1b1727f596..61f3eed115 100644
--- a/plugins/opcua/Makefile.am
+++ b/plugins/opcua/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for OpcUa plugin
#
-# $Id$
-#
# Adapted by Gerhard Gappmeier for OpcUa
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
diff --git a/plugins/opcua/Makefile.common b/plugins/opcua/Makefile.common
index 01e34ab212..7d348a459c 100644
--- a/plugins/opcua/Makefile.common
+++ b/plugins/opcua/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Adapted by Gerhard Gappmeier for OpcUa
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake
index 3750e30713..3e0d49825a 100644
--- a/plugins/opcua/Makefile.nmake
+++ b/plugins/opcua/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for OpcUa plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/opcua/moduleinfo.nmake b/plugins/opcua/moduleinfo.nmake
index d4c6d4583c..430c4733e1 100644
--- a/plugins/opcua/moduleinfo.nmake
+++ b/plugins/opcua/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=opcua
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt
index 5fd80da5e7..ff691a2a85 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/profinet/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
index 5636befdb9..6c3e995d85 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/profinet/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for PROFINET plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/profinet/Makefile.common b/plugins/profinet/Makefile.common
index d3ce017461..92f5e79c84 100644
--- a/plugins/profinet/Makefile.common
+++ b/plugins/profinet/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake
index 4b74f48262..b4ad8cb15a 100644
--- a/plugins/profinet/Makefile.nmake
+++ b/plugins/profinet/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for PROFINET plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/profinet/moduleinfo.nmake b/plugins/profinet/moduleinfo.nmake
index 88169543e4..3f05019f58 100644
--- a/plugins/profinet/moduleinfo.nmake
+++ b/plugins/profinet/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=profinet
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt
index 59f85a3a10..99975e1c85 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/stats_tree/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index 0239142d49..e1f00b5200 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for stats_tree Wireshark plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/stats_tree/Makefile.common b/plugins/stats_tree/Makefile.common
index da461d8097..b3ed2f30a1 100644
--- a/plugins/stats_tree/Makefile.common
+++ b/plugins/stats_tree/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
index e2a048c2fb..88cc86eb94 100644
--- a/plugins/stats_tree/Makefile.nmake
+++ b/plugins/stats_tree/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for stats_tree plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/stats_tree/moduleinfo.nmake b/plugins/stats_tree/moduleinfo.nmake
index 095f2b6bf8..5f454e7edc 100644
--- a/plugins/stats_tree/moduleinfo.nmake
+++ b/plugins/stats_tree/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=stats_tree
diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt
index 4cfa444655..c641f12ab9 100644
--- a/plugins/tpg/CMakeLists.txt
+++ b/plugins/tpg/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am
index 1f3370afbd..9cad59ccd9 100644
--- a/plugins/tpg/Makefile.am
+++ b/plugins/tpg/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for MATE Wireshark plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake
index 1ca0327a40..9ecf2c0b0e 100644
--- a/plugins/tpg/Makefile.nmake
+++ b/plugins/tpg/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ..\..\config.nmake
include <win32.mak>
diff --git a/plugins/tpg/http.tpg b/plugins/tpg/http.tpg
index 5069b17fa8..cb43293e14 100644
--- a/plugins/tpg/http.tpg
+++ b/plugins/tpg/http.tpg
@@ -3,8 +3,6 @@
#
# (c) 2005 Luis E. Garcia Ontanon <luis@ontanon.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt
index 1cf943c64d..9e51055e02 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/unistim/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am
index a48b442ff6..e38fc2d403 100644
--- a/plugins/unistim/Makefile.am
+++ b/plugins/unistim/Makefile.am
@@ -2,8 +2,6 @@
# Automake file for Nortel Unistim plugin
# Copyright 2007, Don Newton <dnewton@cypresscom.net>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/unistim/Makefile.common b/plugins/unistim/Makefile.common
index e0b8bde53c..3d059764f6 100644
--- a/plugins/unistim/Makefile.common
+++ b/plugins/unistim/Makefile.common
@@ -4,8 +4,6 @@
# b) portable between both files
# Copyright 2007 Don Newton <dnewton@cypresscom.net>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake
index 5a84c74ad6..412850997c 100644
--- a/plugins/unistim/Makefile.nmake
+++ b/plugins/unistim/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for Unistim plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/unistim/moduleinfo.nmake b/plugins/unistim/moduleinfo.nmake
index cc06fe3a37..6ea8058f35 100644
--- a/plugins/unistim/moduleinfo.nmake
+++ b/plugins/unistim/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=unistim
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt
index cc963b439c..5aa0387559 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/wimax/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am
index d677789306..b9a8a9dfa8 100644
--- a/plugins/wimax/Makefile.am
+++ b/plugins/wimax/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for Wireshark WiMAX Plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimax/Makefile.common b/plugins/wimax/Makefile.common
index b7e0600ecf..68f795e97f 100644
--- a/plugins/wimax/Makefile.common
+++ b/plugins/wimax/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake
index 09a9d37e77..52c4ea0604 100644
--- a/plugins/wimax/Makefile.nmake
+++ b/plugins/wimax/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for WiMAX plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/wimax/moduleinfo.nmake b/plugins/wimax/moduleinfo.nmake
index bafbb1588f..2a7289d77d 100644
--- a/plugins/wimax/moduleinfo.nmake
+++ b/plugins/wimax/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=m2m
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt
index b39515afa9..d21ad6824b 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/wimaxasncp/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am
index 259d10e9d7..5872459638 100644
--- a/plugins/wimaxasncp/Makefile.am
+++ b/plugins/wimaxasncp/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for wimaxasncp plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimaxasncp/Makefile.common b/plugins/wimaxasncp/Makefile.common
index 2fe340fc6a..630c4c82ef 100644
--- a/plugins/wimaxasncp/Makefile.common
+++ b/plugins/wimaxasncp/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake
index 1f3008c3cf..163773ac23 100644
--- a/plugins/wimaxasncp/Makefile.nmake
+++ b/plugins/wimaxasncp/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for wimaxasncp plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/wimaxasncp/moduleinfo.nmake b/plugins/wimaxasncp/moduleinfo.nmake
index c41637109e..ccf7a4abf6 100644
--- a/plugins/wimaxasncp/moduleinfo.nmake
+++ b/plugins/wimaxasncp/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=wimaxasncp
diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt
index 44e25d0ca9..6ee2007dc3 100644
--- a/plugins/wimaxmacphy/CMakeLists.txt
+++ b/plugins/wimaxmacphy/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am
index 81a9b6eab0..f7ab241185 100644
--- a/plugins/wimaxmacphy/Makefile.am
+++ b/plugins/wimaxmacphy/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for wimaxmacphy plugin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimaxmacphy/Makefile.common b/plugins/wimaxmacphy/Makefile.common
index fad13376b7..d8d9953d26 100644
--- a/plugins/wimaxmacphy/Makefile.common
+++ b/plugins/wimaxmacphy/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/plugins/wimaxmacphy/Makefile.nmake b/plugins/wimaxmacphy/Makefile.nmake
index 02c2cc3ee3..860a21a7b3 100644
--- a/plugins/wimaxmacphy/Makefile.nmake
+++ b/plugins/wimaxmacphy/Makefile.nmake
@@ -1,8 +1,6 @@
# Makefile.nmake
# nmake file for wimaxmacphy plugin
#
-# $Id$
-#
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/plugins/wimaxmacphy/moduleinfo.nmake b/plugins/wimaxmacphy/moduleinfo.nmake
index 71017242ec..14d71c1539 100644
--- a/plugins/wimaxmacphy/moduleinfo.nmake
+++ b/plugins/wimaxmacphy/moduleinfo.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# The name
PACKAGE=wimaxmacphy
diff --git a/radius/Custom.make b/radius/Custom.make
index b9a0ade851..6f8a8b1a7a 100644
--- a/radius/Custom.make
+++ b/radius/Custom.make
@@ -1,5 +1,3 @@
#
-# $Id$
-#
_CUSTOM_radius_dict_ =
diff --git a/radius/dictionary.acme b/radius/dictionary.acme
index e327fce50e..e1f4070f9a 100644
--- a/radius/dictionary.acme
+++ b/radius/dictionary.acme
@@ -7,8 +7,6 @@
#
# Version: 6.2.0 30-Oct-2009 Hadriel Kaplan <hkaplan@acmepacket.com>
#
-# $Id$
-#
VENDOR Acme 9148
BEGIN-VENDOR Acme
diff --git a/radius/dictionary.iea b/radius/dictionary.iea
index 8f3ad71a71..cbfd7974c9 100644
--- a/radius/dictionary.iea
+++ b/radius/dictionary.iea
@@ -3,8 +3,6 @@
# RADIUS VSA Dictionary
# http://www.iea-software.com
#
-# $Id$
-#
VENDOR IEA-Software 24023
BEGIN-VENDOR IEA-Software
diff --git a/test/config.sh b/test/config.sh
index 9f07f52da7..7cd39886d6 100755
--- a/test/config.sh
+++ b/test/config.sh
@@ -2,8 +2,6 @@
#
# Configuration of the command line tests
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/test/hosts.custom b/test/hosts.custom
index d160745def..d799713edb 100644
--- a/test/hosts.custom
+++ b/test/hosts.custom
@@ -1,5 +1,4 @@
# Custom profile hosts
# Matches addresses in dns+icmp.pcapng.gz
-# $Id$
4.2.2.2 custom-4-2-2-2
174.137.42.65 custom-174-137-42-65
diff --git a/test/hosts.global b/test/hosts.global
index a3bc2769b4..9f1b75c425 100644
--- a/test/hosts.global
+++ b/test/hosts.global
@@ -1,5 +1,4 @@
# Global hosts
# Matches addresses in dns+icmp.pcapng.gz
-# $Id$
8.8.8.8 global-8-8-8-8
8.8.4.4 global-8-8-4-4
diff --git a/test/hosts.personal b/test/hosts.personal
index 725ad2a9e2..4a7901bedd 100644
--- a/test/hosts.personal
+++ b/test/hosts.personal
@@ -1,5 +1,4 @@
# Default profile / personal hosts
# Matches addresses in dns+icmp.pcapng.gz
-# $Id$
8.8.4.4 personal-8-8-4-4
4.2.2.2 personal-4-2-2-2
diff --git a/test/suite-capture.sh b/test/suite-capture.sh
index 773b73b039..b4b0fba926 100755
--- a/test/suite-capture.sh
+++ b/test/suite-capture.sh
@@ -2,8 +2,6 @@
#
# Test the capture engine of the Wireshark tools
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/test/suite-clopts.sh b/test/suite-clopts.sh
index 65b4e55dd5..f9932a70a5 100755
--- a/test/suite-clopts.sh
+++ b/test/suite-clopts.sh
@@ -2,8 +2,6 @@
#
# Test the command line options of the Wireshark tools
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh
index e8b512a53b..f94d067910 100755
--- a/test/suite-decryption.sh
+++ b/test/suite-decryption.sh
@@ -2,8 +2,6 @@
#
# Test decryption capabilities of the Wireshark tools
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/test/suite-fileformats.sh b/test/suite-fileformats.sh
index 09f279c0aa..3c927b57b2 100755
--- a/test/suite-fileformats.sh
+++ b/test/suite-fileformats.sh
@@ -2,8 +2,6 @@
#
# Test file format conversions of the Wireshark tools
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/test/suite-io.sh b/test/suite-io.sh
index b85032e9c9..c8f471b106 100755
--- a/test/suite-io.sh
+++ b/test/suite-io.sh
@@ -2,8 +2,6 @@
#
# Test the file I/O of the Wireshark tools
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/test/suite-nameres.sh b/test/suite-nameres.sh
index 88ec6f6ffc..5ed5fecdc7 100755
--- a/test/suite-nameres.sh
+++ b/test/suite-nameres.sh
@@ -2,8 +2,6 @@
#
# Test for correct name resolution behavior
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh
index 7883aa3104..bf6168e9a3 100755
--- a/test/suite-unittests.sh
+++ b/test/suite-unittests.sh
@@ -2,8 +2,6 @@
#
# Run the epan unit tests
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
#
diff --git a/test/suite-wslua.sh b/test/suite-wslua.sh
index d4eaa60489..5afdc9a516 100755
--- a/test/suite-wslua.sh
+++ b/test/suite-wslua.sh
@@ -2,8 +2,6 @@
#
# Run the epan unit tests
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
#
diff --git a/test/test-backend.sh b/test/test-backend.sh
index f9173027af..856cfc9b72 100755
--- a/test/test-backend.sh
+++ b/test/test-backend.sh
@@ -2,8 +2,6 @@
#
# Test backend
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/test/test.sh b/test/test.sh
index 65538ae46a..6ed3f0e3a3 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -5,8 +5,6 @@
#
# Test various command line testable aspects of the Wireshark tools
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2005 Ulf Lamping
diff --git a/tools/cppcheck/cppcheck.sh b/tools/cppcheck/cppcheck.sh
index c7c3984c86..324222fd90 100755
--- a/tools/cppcheck/cppcheck.sh
+++ b/tools/cppcheck/cppcheck.sh
@@ -5,8 +5,6 @@
# Script to run CppCheck Static Analyzer.
# http://cppcheck.sourceforge.net/
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2012 Gerald Combs
diff --git a/tools/dftestlib/__init__.py b/tools/dftestlib/__init__.py
index 314bb5e59c..557e94e205 100755
--- a/tools/dftestlib/__init__.py
+++ b/tools/dftestlib/__init__.py
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright (C) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
# This program is free software; you can redistribute it and/or
diff --git a/tools/dftestlib/bytes_ether.py b/tools/dftestlib/bytes_ether.py
index 64d206d762..3836a323bb 100755
--- a/tools/dftestlib/bytes_ether.py
+++ b/tools/dftestlib/bytes_ether.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/bytes_ipv6.py b/tools/dftestlib/bytes_ipv6.py
index 229c531d72..3d2c9ee86e 100755
--- a/tools/dftestlib/bytes_ipv6.py
+++ b/tools/dftestlib/bytes_ipv6.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/bytes_type.py b/tools/dftestlib/bytes_type.py
index 3569d4a3a1..5cfe0158cb 100755
--- a/tools/dftestlib/bytes_type.py
+++ b/tools/dftestlib/bytes_type.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/dftest.py b/tools/dftestlib/dftest.py
index 05f2bd6bdd..d6d32c497c 100755
--- a/tools/dftestlib/dftest.py
+++ b/tools/dftestlib/dftest.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/double.py b/tools/dftestlib/double.py
index 9a20884f90..2418eab4e1 100755
--- a/tools/dftestlib/double.py
+++ b/tools/dftestlib/double.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/integer.py b/tools/dftestlib/integer.py
index 0417fb6d37..fca4f23cdd 100755
--- a/tools/dftestlib/integer.py
+++ b/tools/dftestlib/integer.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/integer_1byte.py b/tools/dftestlib/integer_1byte.py
index 33ff23b55d..da6163ae6e 100755
--- a/tools/dftestlib/integer_1byte.py
+++ b/tools/dftestlib/integer_1byte.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/ipv4.py b/tools/dftestlib/ipv4.py
index efa2f5c7fa..9c17e361db 100755
--- a/tools/dftestlib/ipv4.py
+++ b/tools/dftestlib/ipv4.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/range_method.py b/tools/dftestlib/range_method.py
index d189f3a314..613d476e22 100755
--- a/tools/dftestlib/range_method.py
+++ b/tools/dftestlib/range_method.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/scanner.py b/tools/dftestlib/scanner.py
index a2fc700c7f..1830616c73 100755
--- a/tools/dftestlib/scanner.py
+++ b/tools/dftestlib/scanner.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/string_type.py b/tools/dftestlib/string_type.py
index 37eb7e33d0..fba92a286c 100755
--- a/tools/dftestlib/string_type.py
+++ b/tools/dftestlib/string_type.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/stringz.py b/tools/dftestlib/stringz.py
index e843906141..d1f203ce8c 100755
--- a/tools/dftestlib/stringz.py
+++ b/tools/dftestlib/stringz.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/time_relative.py b/tools/dftestlib/time_relative.py
index 4e6bf93506..d875a85054 100755
--- a/tools/dftestlib/time_relative.py
+++ b/tools/dftestlib/time_relative.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/time_type.py b/tools/dftestlib/time_type.py
index 4958322ef8..81464ff5be 100755
--- a/tools/dftestlib/time_type.py
+++ b/tools/dftestlib/time_type.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/tvb.py b/tools/dftestlib/tvb.py
index c00bed55ad..d4c7a92a78 100755
--- a/tools/dftestlib/tvb.py
+++ b/tools/dftestlib/tvb.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/uint64.py b/tools/dftestlib/uint64.py
index f0c9527d22..8edd955881 100755
--- a/tools/dftestlib/uint64.py
+++ b/tools/dftestlib/uint64.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/dftestlib/util.py b/tools/dftestlib/util.py
index 0aee8e87c0..cb301eb0f6 100755
--- a/tools/dftestlib/util.py
+++ b/tools/dftestlib/util.py
@@ -1,7 +1,5 @@
# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
-# $Id$
-#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt
index 1ad31e1af1..d0b7cb84ae 100644
--- a/tools/lemon/CMakeLists.txt
+++ b/tools/lemon/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am
index fe931446c2..83b9385fc1 100644
--- a/tools/lemon/Makefile.am
+++ b/tools/lemon/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2001 Gerald Combs
diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake
index d629ec4008..56ee8540c0 100644
--- a/tools/lemon/Makefile.nmake
+++ b/tools/lemon/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
diff --git a/tools/tpg/Makefile.am b/tools/tpg/Makefile.am
index df18fc2ac4..52ceac1e60 100644
--- a/tools/tpg/Makefile.am
+++ b/tools/tpg/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2001 Gerald Combs
diff --git a/tools/tpg/Makefile.nmake b/tools/tpg/Makefile.nmake
index ee48175b07..214b9f767e 100644
--- a/tools/tpg/Makefile.nmake
+++ b/tools/tpg/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
diff --git a/tools/tpg/V2P.pm b/tools/tpg/V2P.pm
index 974bdccd62..2856110c6f 100644
--- a/tools/tpg/V2P.pm
+++ b/tools/tpg/V2P.pm
@@ -5,8 +5,6 @@
#
# (c) 2002, Luis E. Garcia Ontanon <luis@ontanon.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
diff --git a/tools/tpg/tpg.pl b/tools/tpg/tpg.pl
index a4c61d50ae..f27c720de0 100755
--- a/tools/tpg/tpg.pl
+++ b/tools/tpg/tpg.pl
@@ -4,8 +4,6 @@
#
# Given a bnf like grammar generate a parser for text based tvbs
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
diff --git a/tools/tpg/tpg.yp b/tools/tpg/tpg.yp
index b5c9a7abd9..8cda915a44 100644
--- a/tools/tpg/tpg.yp
+++ b/tools/tpg/tpg.yp
@@ -5,8 +5,6 @@
#
# Given a bnf like grammar generate a parser for text based tvbs
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
diff --git a/tpncp/tpncp.dat b/tpncp/tpncp.dat
index 341df7514e..adeb653472 100644
--- a/tpncp/tpncp.dat
+++ b/tpncp/tpncp.dat
@@ -1,4 +1,3 @@
-# $Id$
Audiocodes TrunkPack Network Control Protocol (TPNCP) Version L5.60.000.000
acEV_NONE 0
acEV_ERROR 1
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 07f9aea0be..4669281b75 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/Makefile.am b/ui/Makefile.am
index a1f14cd73e..9cff88f696 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -2,8 +2,6 @@
# Automake file for the common-to-all-toolkits user interface routines
# for Wireshark
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/Makefile.common b/ui/Makefile.common
index 8813ad9f69..38a521cd53 100644
--- a/ui/Makefile.common
+++ b/ui/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/Makefile.nmake b/ui/Makefile.nmake
index 7613b81b84..db5dd1c9f4 100644
--- a/ui/Makefile.nmake
+++ b/ui/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\config.nmake
include ..\Makefile.nmake.inc
diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am
index 4b5231d9ed..c6b4a7b8ae 100644
--- a/ui/cli/Makefile.am
+++ b/ui/cli/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for the TShark taps
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/cli/Makefile.common b/ui/cli/Makefile.common
index 99359c920a..fca2671bca 100644
--- a/ui/cli/Makefile.common
+++ b/ui/cli/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake
index 09f9eb8d48..2fe092f7a8 100644
--- a/ui/cli/Makefile.nmake
+++ b/ui/cli/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/ui/doxygen.cfg.in b/ui/doxygen.cfg.in
index 3fe5d5f6d8..c0f8e81a42 100644
--- a/ui/doxygen.cfg.in
+++ b/ui/doxygen.cfg.in
@@ -1,4 +1,3 @@
-# $Id$
# @configure_input@
@INCLUDE = ../doxygen_global.cfg
diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt
index c7db46caea..48fc8e4100 100644
--- a/ui/gtk/CMakeLists.txt
+++ b/ui/gtk/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index d280ff9127..d79ba79013 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for the GTK interface routines for Wireshark
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
index 0012d17885..3c08706251 100644
--- a/ui/gtk/Makefile.common
+++ b/ui/gtk/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake
index e75c6b8d39..835ab0f881 100644
--- a/ui/gtk/Makefile.nmake
+++ b/ui/gtk/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/ui/gtk/Makefile_custom.common b/ui/gtk/Makefile_custom.common
index 539b3f3b8f..8f9c9b389f 100644
--- a/ui/gtk/Makefile_custom.common
+++ b/ui/gtk/Makefile_custom.common
@@ -1,5 +1,4 @@
-#
-# $Id$
+#
# You can add custom GUI files here
#
diff --git a/ui/gtk/doxygen.cfg.in b/ui/gtk/doxygen.cfg.in
index 1c35061a20..700aa6645f 100644
--- a/ui/gtk/doxygen.cfg.in
+++ b/ui/gtk/doxygen.cfg.in
@@ -1,4 +1,3 @@
-# $Id$
# @configure_input@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 581507d2bb..45723eda51 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 2c8820af97..2bb27aead7 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for the Qt interface routines for Wireshark
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common
index 8094f9cf34..3581dbe409 100644
--- a/ui/qt/Makefile.common
+++ b/ui/qt/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/qt/Makefile_custom.common b/ui/qt/Makefile_custom.common
index a037d2dd48..ec8e7496a8 100644
--- a/ui/qt/Makefile_custom.common
+++ b/ui/qt/Makefile_custom.common
@@ -1,5 +1,4 @@
-#
-# $Id$
+#
# You can add custom GUI files here
#
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index ebb35c97c0..c8bb097905 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -4,8 +4,6 @@
#
#-------------------------------------------------
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/ui/qt/doxygen.cfg.in b/ui/qt/doxygen.cfg.in
index e7d46be39b..d4e63ab8a8 100644
--- a/ui/qt/doxygen.cfg.in
+++ b/ui/qt/doxygen.cfg.in
@@ -1,4 +1,3 @@
-# $Id$
# @configure_input@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
diff --git a/ui/win32/Makefile.nmake b/ui/win32/Makefile.nmake
index ec60facd3d..ecd6a1d6bf 100644
--- a/ui/win32/Makefile.nmake
+++ b/ui/win32/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\..\config.nmake
include ..\..\Makefile.nmake.inc
diff --git a/ui/win32/settings.ini b/ui/win32/settings.ini
index 073ebb62ed..af41c6f7e5 100644
--- a/ui/win32/settings.ini
+++ b/ui/win32/settings.ini
@@ -1,4 +1,3 @@
-# $Id$
[Settings]
gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR
# disable images in buttons.
diff --git a/wireshark.desktop b/wireshark.desktop
index b0fe1ae493..9e3ddcdc7a 100644
--- a/wireshark.desktop
+++ b/wireshark.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-# $Id$
# The format of this file is specified at
# http://standards.freedesktop.org/desktop-entry-spec/1.0/
# The entries are in the order they are listed in version 1.0
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 127dafde6f..37432cbeb5 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 6319316148..c8948d28b0 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/wiretap/Makefile.common b/wiretap/Makefile.common
index eb3359ab99..1929ecf330 100644
--- a/wiretap/Makefile.common
+++ b/wiretap/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index e09edd061c..56b50adb55 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -1,6 +1,4 @@
#
-# $Id$
-#
include ..\config.nmake
include <win32.mak>
diff --git a/wka.tmpl b/wka.tmpl
index 0dd9c1aaf0..032a3cf5c8 100644
--- a/wka.tmpl
+++ b/wka.tmpl
@@ -1,8 +1,6 @@
#
# Well-known addresses.
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index c4251ea0bb..d93b75878f 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -1,7 +1,5 @@
# CMakeLists.txt
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index 0b1256c7e8..b5b9c910d5 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -1,7 +1,5 @@
# Makefile.am
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 0efc26fb1a..8e1f4435c9 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -3,8 +3,6 @@
# a) common to both files and
# b) portable between both files
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake
index 4da5224075..dafce07378 100644
--- a/wsutil/Makefile.nmake
+++ b/wsutil/Makefile.nmake
@@ -1,7 +1,6 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id$
include ..\config.nmake
include <win32.mak>