[GMT-coastlines/el5/master] Update to 2.1.1

[Orion Poplawski]

commit 46d7ebfe6c24e10ed704c14a6676f2127fa75ab5
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Mar 10 16:24:36 2011 -0700

    Update to 2.1.1

 .gitignore          |    9 +++++++++
 GMT-coastlines.spec |    7 +++++--
 sources             |    6 +++---
 3 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12e9cad..c456097 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,12 @@
+<<<<<<< HEAD
 GSHHS2.0.2_coast.tar.bz2
 GSHHS2.0.2_full.tar.bz2
 GSHHS2.0.2_high.tar.bz2
+=======
+GSHHS2.1.0_coast.tar.bz2
+GSHHS2.1.0_full.tar.bz2
+GSHHS2.1.0_high.tar.bz2
+/GSHHS2.1.1_coast.tar.bz2
+/GSHHS2.1.1_full.tar.bz2
+/GSHHS2.1.1_high.tar.bz2
+>>>>>>> 1ffe355... Update to 2.1.1
diff --git a/GMT-coastlines.spec b/GMT-coastlines.spec
index a6a03de..72b2e5b 100644
--- a/GMT-coastlines.spec
+++ b/GMT-coastlines.spec
@@ -1,6 +1,6 @@
 Name:           GMT-coastlines
-Version:        2.1.0
-Release:        1
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        Coastline data for GMT
 
 Group:          Applications/Engineering
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 9 2011 Orion Poplawski <orion at cora.nwra.com> 2.1.1-1
+- Update to 2.1.1
+
 * Thu Aug 12 2010 Orion Poplawski <orion at cora.nwra.com> 2.1.0-1
 - Update to 2.1.0
 
diff --git a/sources b/sources
index b557817..21a63c1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-1f84a99effe96e12fb60f31fa3cf35bb  GSHHS2.1.0_coast.tar.bz2
-da679a412056e401bb624a213d4b11d6  GSHHS2.1.0_full.tar.bz2
-51128a3c545fd48364a2da830ebce1b6  GSHHS2.1.0_high.tar.bz2
+68a3f9eb6605c17b3369b6f6f5e94549  GSHHS2.1.1_coast.tar.bz2
+603c802f4408e33db974508ebc647ef9  GSHHS2.1.1_full.tar.bz2
+78e23d1444452fa8ddc9b67e2ad89a01  GSHHS2.1.1_high.tar.bz2