SSH Dissector : Remove ssh_proto_tree_add_item (No longer needed)

[metze/wireshark/wip.git] / version_info.c

diff --git a/version_info.c b/version_info.c
index b1e9d8b4ff414e745ba9ba7771057676eff5d46a..293fb1d9045e8c9350be03a4cd80cffaea572734 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -1,8 +1,6 @@
 /* version_info.c
  * Routines to report version information for stuff used by Wireshark
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -43,7 +41,7 @@
 #include "capture-pcap-util.h"
 #include <wsutil/unicode-utils.h>
 
-#include "svnversion.h"
+#include "version.h"
 
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
@@ -58,10 +56,10 @@
 # include <sys/capability.h>
 #endif
 
-#ifdef SVNVERSION
-       const char *wireshark_svnversion = " (" SVNVERSION " from " SVNPATH ")";
+#ifdef GITVERSION
+       const char *wireshark_gitversion = " (" GITVERSION " from " GITBRANCH ")";
 #else
-       const char *wireshark_svnversion = "";
+       const char *wireshark_gitversion = "";
 #endif
 
 /*
@@ -626,7 +624,7 @@ do_cpuid(int *CPUInfo, guint32 selector){
        __cpuid(CPUInfo, selector);
 }
 #elif defined(__GNUC__)
-#if defined(__x86_64__)  
+#if defined(__x86_64__)
 static inline void
 do_cpuid(guint32 *CPUInfo, int selector)
 {
@@ -697,7 +695,7 @@ static void get_mem_info(GString *str _U_)
        MEMORYSTATUSEX statex;
 
        statex.dwLength = sizeof (statex);
-       
+
        if(GlobalMemoryStatusEx (&statex))
                g_string_append_printf(str, ", with ""%" G_GINT64_MODIFIER "d" "MB of physical memory.\n", statex.ullTotalPhys/(1024*1024));
 #endif
@@ -835,7 +833,7 @@ const char *
 get_copyright_info(void)
 {
        return
-"Copyright 1998-2013 Gerald Combs <gerald@wireshark.org> and contributors.\n"
+"Copyright 1998-2014 Gerald Combs <gerald@wireshark.org> and contributors.\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
 }