aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-02-04 18:27:05 +0000
committerGerald Combs <gerald@wireshark.org>2013-02-04 18:27:05 +0000
commit72db5eed02a737f74ed44c08d598e9cef63f8e97 (patch)
treed1ef5e748c5ff1ba094c5f8ada41e0062fd56989 /epan/dfilter
parent5130da6935fbf2edcced9665ad767e9342cb5186 (diff)
Unwrap lines inadvertenly wrapped in r47472
svn path=/trunk/; revision=47473
Diffstat (limited to 'epan/dfilter')
-rw-r--r--epan/dfilter/Makefile.am36
1 files changed, 22 insertions, 14 deletions
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index a67acaf11a..bdf01097c4 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -1,17 +1,25 @@
-# Makefile.am # # $Id$ #
-# Wireshark - Network traffic analyzer # By Gerald Combs
-<gerald@wireshark.org> # Copyright 2001 Gerald Combs # # 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 # of the License, or (at your
-option) any later version. # # This program is distributed in the hope
-that it will be useful, # but WITHOUT ANY WARRANTY; without even the
-implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE. See the # GNU General Public License for more details. # #
-You should have received a copy of the GNU General Public License #
-along with this program; if not, write to the Free Software #
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA. #
+# Makefile.am
+#
+# $Id$
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 2001 Gerald Combs
+#
+# 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
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
include ../../Makefile.am.inc