diff options
| author |  Samuel Mimram <smimram@debian.org> | 2006-04-28 14:59:16 +0000 |
|---|---|---|
| committer | Samuel Mimram <smimram@debian.org> | 2006-04-28 14:59:16 +0000 |
| commit | 2c4a6b4efe55a2c6ca9ca7b185723e7909e57269 (patch) | |
| tree | e1542c8adb83ff297284eefc23a2703461713d9b /theories/Sorting | |
| parent | 514dce2dfe717e3ed2e37dce6467b56219d451c1 (diff) | |
| parent | 3ef7797ef6fc605dfafb32523261fe1b023aeecb (diff) | |
Merge commit 'upstream/8.0pl3+8.1alpha' into 8.0pl3+8.1alpha
Diffstat (limited to 'theories/Sorting')
| -rw-r--r-- | theories/Sorting/Heap.v | 2 | ||||
| -rw-r--r-- | theories/Sorting/Permutation.v | 2 | ||||
| -rw-r--r-- | theories/Sorting/Sorting.v | 2 | ||||
| -rw-r--r-- | theories/Sorting/intro.tex | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/theories/Sorting/Heap.v b/theories/Sorting/Heap.v index 41594749..346ae95a 100644 --- a/theories/Sorting/Heap.v +++ b/theories/Sorting/Heap.v @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: Heap.v,v 1.3.2.1 2004/07/16 19:31:19 herbelin Exp $ i*) +(*i $Id: Heap.v 5920 2004-07-16 20:01:26Z herbelin $ i*) (** A development of Treesort on Heap trees *) diff --git a/theories/Sorting/Permutation.v b/theories/Sorting/Permutation.v index 43a0f0bc..b3287cd1 100644 --- a/theories/Sorting/Permutation.v +++ b/theories/Sorting/Permutation.v @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: Permutation.v,v 1.4.2.1 2004/07/16 19:31:19 herbelin Exp $ i*) +(*i $Id: Permutation.v 5920 2004-07-16 20:01:26Z herbelin $ i*) Require Import Relations. Require Import List. diff --git a/theories/Sorting/Sorting.v b/theories/Sorting/Sorting.v index aa829fea..0e0bfe8f 100644 --- a/theories/Sorting/Sorting.v +++ b/theories/Sorting/Sorting.v @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: Sorting.v,v 1.4.2.1 2004/07/16 19:31:19 herbelin Exp $ i*) +(*i $Id: Sorting.v 5920 2004-07-16 20:01:26Z herbelin $ i*) Require Import List. Require Import Multiset. diff --git a/theories/Sorting/intro.tex b/theories/Sorting/intro.tex new file mode 100644 index 00000000..64ae4c88 --- /dev/null +++ b/theories/Sorting/intro.tex @@ -0,0 +1 @@ +\section{Sorting}\label{Sorting} |