aboutsummaryrefslogtreecommitdiff
path: root/libmap
diff options
context:
space:
mode:
authorMichael Terry <mike@mterry.name>2011-03-01 15:33:47 -0500
committerMichael Terry <mike@mterry.name>2011-03-01 15:33:47 -0500
commitae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57 (patch)
tree4dc39c5d885db1041a93b7024a1d4e754c9c7b42 /libmap
parent486ad3625ca52b318f5514f782b90f1eda0b87e7 (diff)
parentb79665734363a3644d3eb7b13a110908ac05d3a1 (diff)
downloadayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.tar.gz
ayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.tar.bz2
ayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.zip
merge from trunk
Diffstat (limited to 'libmap')
-rw-r--r--libmap/data/olsen_map.pngbin0 -> 54969 bytes
-rw-r--r--libmap/test-timezone.c1
2 files changed, 1 insertions, 0 deletions
diff --git a/libmap/data/olsen_map.png b/libmap/data/olsen_map.png
new file mode 100644
index 0000000..f9bb75c
--- /dev/null
+++ b/libmap/data/olsen_map.png
Binary files differ
diff --git a/libmap/test-timezone.c b/libmap/test-timezone.c
index d667c42..c1935fd 100644
--- a/libmap/test-timezone.c
+++ b/libmap/test-timezone.c
@@ -47,6 +47,7 @@ int main (int argc, char **argv)
g_free (filename);
g_free (path);
+ tz_info_free (info);
}
tz_db_free (db);
g_free (pixmap_dir);