aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <hagbard@physics.rutgers.edu>2001-04-01 06:11:25 +0000
committerEd Warnicke <hagbard@physics.rutgers.edu>2001-04-01 06:11:25 +0000
commit48421be1d29b8aa633ed711f83312bfdadcace1c (patch)
tree916642f76ff08410e4a0ac98f80a32bc1f40e799
parent3bf0b09117532d5151c48356696d788fed2e8f98 (diff)
Moved timestamp.h into epan.
svn path=/trunk/; revision=3228
-rw-r--r--Makefile.am3
-rw-r--r--epan/Makefile.am3
-rw-r--r--epan/timestamp.h (renamed from timestamp.h)2
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 95e71b47ad..33c8952055 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.298 2001/03/31 10:13:10 guy Exp $
+# $Id: Makefile.am,v 1.299 2001/04/01 06:11:24 hagbard Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -360,7 +360,6 @@ ETHEREAL_COMMON_SOURCES = \
register.c \
register.h \
smb.h \
- timestamp.h \
util.c \
util.h \
xdlc.c \
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 9d74731877..ce8d060071 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -2,7 +2,7 @@
# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am,v 1.23 2001/04/01 05:48:15 hagbard Exp $
+# $Id: Makefile.am,v 1.24 2001/04/01 06:11:25 hagbard Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -71,6 +71,7 @@ libethereal_a_SOURCES = \
sna-utils.h \
strutil.c \
strutil.h \
+ timestamp.h \
to_str.c \
to_str.h \
tvbuff.c \
diff --git a/timestamp.h b/epan/timestamp.h
index 261cb7fcf2..af5e7f1410 100644
--- a/timestamp.h
+++ b/epan/timestamp.h
@@ -1,7 +1,7 @@
/* timestamp.h
* Defines for packet timestamps
*
- * $Id: timestamp.h,v 1.3 2000/11/01 08:31:33 guy Exp $
+ * $Id: timestamp.h,v 1.1 2001/04/01 06:11:25 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>