From 300293c119981054c95182a90c829058530a6b6f Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Sun, 25 Dec 2011 13:19:42 +0100
Subject: Imported Upstream version 8.3.pl3

---
 theories/Sorting/Heap.v         | 4 ++--
 theories/Sorting/Mergesort.v    | 4 ++--
 theories/Sorting/PermutEq.v     | 4 ++--
 theories/Sorting/PermutSetoid.v | 4 ++--
 theories/Sorting/Permutation.v  | 4 ++--
 theories/Sorting/Sorted.v       | 4 ++--
 theories/Sorting/Sorting.v      | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'theories/Sorting')

diff --git a/theories/Sorting/Heap.v b/theories/Sorting/Heap.v
index eb53f061..76080aa9 100644
--- a/theories/Sorting/Heap.v
+++ b/theories/Sorting/Heap.v
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: Heap.v 13346 2010-07-28 17:17:32Z msozeau $ i*)
+(*i $Id: Heap.v 14641 2011-11-06 11:59:10Z herbelin $ i*)
 
 (** This file is deprecated, for a tree on list, use [Mergesort.v]. *)
 
diff --git a/theories/Sorting/Mergesort.v b/theories/Sorting/Mergesort.v
index 04de1bfc..cded23ea 100644
--- a/theories/Sorting/Mergesort.v
+++ b/theories/Sorting/Mergesort.v
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: Mergesort.v 13678 2010-12-04 10:34:28Z herbelin $ i*)
+(*i $Id: Mergesort.v 14641 2011-11-06 11:59:10Z herbelin $ i*)
 
 (** A modular implementation of mergesort (the complexity is O(n.log n) in
    the length of the list) *)
diff --git a/theories/Sorting/PermutEq.v b/theories/Sorting/PermutEq.v
index 00a09051..00d6e7ce 100644
--- a/theories/Sorting/PermutEq.v
+++ b/theories/Sorting/PermutEq.v
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: PermutEq.v 13323 2010-07-24 15:57:30Z herbelin $ i*)
+(*i $Id: PermutEq.v 14641 2011-11-06 11:59:10Z herbelin $ i*)
 
 Require Import Relations Setoid SetoidList List Multiset PermutSetoid Permutation.
 
diff --git a/theories/Sorting/PermutSetoid.v b/theories/Sorting/PermutSetoid.v
index e47e2b84..87b0b08d 100644
--- a/theories/Sorting/PermutSetoid.v
+++ b/theories/Sorting/PermutSetoid.v
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: PermutSetoid.v 13323 2010-07-24 15:57:30Z herbelin $ i*)
+(*i $Id: PermutSetoid.v 14641 2011-11-06 11:59:10Z herbelin $ i*)
 
 Require Import Omega Relations Multiset SetoidList.
 
diff --git a/theories/Sorting/Permutation.v b/theories/Sorting/Permutation.v
index 1e145f57..7508ccc2 100644
--- a/theories/Sorting/Permutation.v
+++ b/theories/Sorting/Permutation.v
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: Permutation.v 13323 2010-07-24 15:57:30Z herbelin $ i*)
+(*i $Id: Permutation.v 14641 2011-11-06 11:59:10Z herbelin $ i*)
 
 (*********************************************************************)
 (** ** List permutations as a composition of adjacent transpositions *)
diff --git a/theories/Sorting/Sorted.v b/theories/Sorting/Sorted.v
index ab399d40..2c7c07e5 100644
--- a/theories/Sorting/Sorted.v
+++ b/theories/Sorting/Sorted.v
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: Sorted.v 13323 2010-07-24 15:57:30Z herbelin $ i*)
+(*i $Id: Sorted.v 14641 2011-11-06 11:59:10Z herbelin $ i*)
 
 (* Made by Hugo Herbelin *)
 
diff --git a/theories/Sorting/Sorting.v b/theories/Sorting/Sorting.v
index 860e0517..bc1fdbcf 100644
--- a/theories/Sorting/Sorting.v
+++ b/theories/Sorting/Sorting.v
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: Sorting.v 13323 2010-07-24 15:57:30Z herbelin $ i*)
+(*i $Id: Sorting.v 14641 2011-11-06 11:59:10Z herbelin $ i*)
 
 Require Export Sorted.
 Require Export Mergesort.
-- 
cgit v1.2.3