From Douglas Pratley with trivial changes and documentation changes

by myself:

Corrected patch; epan/column.c and epan/column_utils.c were not included. This
one has now been properly tested against a clean checkout of today's code.

- New menu option available under view\time display format
- New sub-option (e) to -t switch for both wireshark and tshark
- Extended recent settings code to handle new value
- Did NOT add new explicit epoch time column



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20040 f5534014-38df-0310-8fa8-9805f1628bb7

2 files changed, 8 insertions, 4 deletions

diff --git a/doc/tshark.pod b/doc/tshark.pod
index ed0d7e70a8..b3474b4e77 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -27,7 +27,7 @@ S<[ B<-r> E<lt>infileE<gt> ]>
 S<[ B<-R> E<lt>read (display) filterE<gt> ]>
 S<[ B<-s> E<lt>capture snaplenE<gt> ]>
 S<[ B<-S> ]>
-S<[ B<-t> ad|a|r|d ]>
+S<[ B<-t> ad|a|r|d|e ]>
 S<[ B<-T> pdml|psml|ps|text ]>
 S<[ B<-v> ]>
 S<[ B<-V> ]>
@@ -349,7 +349,7 @@ memory, or saved to disk.
 Decode and display packets even while writing raw packet data using the
 B<-w> option.
 
-=item -t  ad|a|r|d
+=item -t  ad|a|r|d|e
 
 Set the format of the packet timestamp printed in summary lines, the default 
 is relative. The format can be one of:
@@ -366,6 +366,8 @@ and the current packet
 B<d> delta: The delta time is the time since the previous packet was
 captured
 
+B<e> epoch: The time in seconds since epoch (Jan 1, 1970 00:00:00)
+
 =item -T  pdml|psml|ps|text
 
 Set the format of the output when viewing decoded packet data.  The
diff --git a/doc/wireshark.pod b/doc/wireshark.pod
index 6fa570edb2..ea350a6816 100644
--- a/doc/wireshark.pod
+++ b/doc/wireshark.pod
@@ -30,7 +30,7 @@ S<[ B<-r> E<lt>infileE<gt> ]>
 S<[ B<-R> E<lt>read (display) filterE<gt> ]>
 S<[ B<-S> ]>
 S<[ B<-s> E<lt>capture snaplenE<gt> ]>
-S<[ B<-t> ad|a|r|d ]>
+S<[ B<-t> ad|a|r|d|e ]>
 S<[ B<-v> ]>
 S<[ B<-w> E<lt>outfileE<gt> ]>
 S<[ B<-y> E<lt>capture link typeE<gt> ]>
@@ -390,7 +390,7 @@ Set the default snapshot length to use when capturing live data.
 No more than I<snaplen> bytes of each network packet will be read into
 memory, or saved to disk.
 
-=item -t  ad|a|r|d
+=item -t  ad|a|r|d|e
 
 Set the format of the packet timestamp displayed in the packet list
 window, the default is relative. The format can be one of:
@@ -407,6 +407,8 @@ and the current packet
 B<d> delta: The delta time is the time since the previous packet was
 captured
 
+B<e> epoch: The time in seconds since epoch (Jan 1, 1970 00:00:00)
+
 =item -v
 
 Print the version and exit.