[R-ROC/f14] Update to 1.28.0

[Pierre-YvesChibon]

commit 27029ecd325a4848d3fd240addefef8973ba56f0
Author: pingou <pingou at pingoured.fr>
Date:   Wed Jun 22 20:39:05 2011 +0200

    Update to 1.28.0

 .gitignore |    5 +++++
 R-ROC.spec |    7 +++++--
 sources    |    4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6fdb92d..55b58ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 /ROC_1.24.1.tar.gz
+<<<<<<< HEAD
+=======
+/ROC_1.26.0.tar.gz
+/ROC_1.28.0.tar.gz
+>>>>>>> 94a8a8f... Update to 1.28.0
diff --git a/R-ROC.spec b/R-ROC.spec
index d707e81..85e4481 100644
--- a/R-ROC.spec
+++ b/R-ROC.spec
@@ -1,8 +1,8 @@
 %global packname  ROC
 
 Name:             R-%{packname}
-Version:          1.24.1
-Release:          1%{?dist}.1
+Version:          1.28.0
+Release:          1%{dist}
 Summary:          Utilities for ROC
 
 Group:            Applications/Engineering
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 22 2011 pingou <pingou at pingoured.fr> 1.28.0-1
+- Update to version 1.28.0
+
 * Tue Oct 05 2010 jkeating - 1.24.1-1.1
 - Rebuilt for gcc bug 634757
 
diff --git a/sources b/sources
index c681040..b138032 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1fcb78c8a2d53c58773534f906cc5f42  ROC_1.24.1.tar.gz
+=======
+5eaeca1d3f10c4d7b80fb60dabc50dfc  ROC_1.28.0.tar.gz
+>>>>>>> 94a8a8f... Update to 1.28.0