From f966980937abd4899a9c43329041bb00798ab18e Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 7 Feb 2014 11:14:52 -0800 Subject: Replace "svn" with "git" all over the place. Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs --- ui/gtk/file_import_dlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/gtk/file_import_dlg.c') diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index 7d992fc710..5ad8a80ce5 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -475,7 +475,7 @@ file_import_open(text_import_info_t *info) os_info_str = g_string_new(""); get_os_version_info(os_info_str); - g_snprintf(appname, sizeof(appname), "Wireshark " VERSION "%s", wireshark_svnversion); + g_snprintf(appname, sizeof(appname), "Wireshark " VERSION "%s", wireshark_gitversion); shb_hdr = g_new(wtapng_section_t,1); shb_hdr->section_length = -1; -- cgit v1.2.3