3392e41b22
- Merge fixes from lp:timezonemap - Add cc-timezone-location.h to timezonemapincludes_HEADERS so it gets installed (iain.lane) - Set en_name correctly (iain.lane) - Don't call g_type_init() on glib >= 2.35; it's deprecated (iain.lane)
23 lines
502 B
Diff
23 lines
502 B
Diff
From b81b960a9f5ba1fed1ae47fb852c7ccb67c7c5cf Mon Sep 17 00:00:00 2001
|
|
From: Iain Lane <iain.lane@canonical.com>
|
|
Date: Fri, 29 Nov 2013 10:28:43 +0000
|
|
Subject: [PATCH 14/18] Merge r39 from lp:~dshea/timezonemap/trunk
|
|
|
|
Ignore INSTALL too; generated file
|
|
---
|
|
.bzrignore | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/.bzrignore b/.bzrignore
|
|
index e488bbc..abe0491 100644
|
|
--- a/.bzrignore
|
|
+++ b/.bzrignore
|
|
@@ -19,3 +19,4 @@ m4/*.m4
|
|
*.la
|
|
src/test-timezone
|
|
src/timezonemap.pc
|
|
+INSTALL
|
|
--
|
|
1.8.4.2
|
|
|