Permalink
Browse files

Rolled back accidental commit in a branch.

git-svn-id: http://svn.daimi.au.dk/svn/tpie/tags/v10Nov05@1738 669acd26-ddd2-4139-9e68-486997aa639d
  • Loading branch information...
Henrik Blunck
Henrik Blunck committed Oct 30, 2008
1 parent a0645d7 commit edd3720450491d8acc1a36dfdaccaf4b7ac8ee91
Showing with 12 additions and 6 deletions.
  1. +0 −1 tpie/include/ami_merge.h
  2. +12 −5 tpie/include/merge_sorted_runs.h
View
@@ -20,7 +20,6 @@
#include <ami_stream.h>
-/** @depricated */
enum AMI_merge_output_type {
AMI_MERGE_OUTPUT_OVERWRITE = 1,
AMI_MERGE_OUTPUT_APPEND
@@ -1,10 +1,17 @@
+// TODO: Document better
+
+// File: merge_sorted_runs.h
+
#ifndef _MERGE_SORTED_RUNS_H
#define _MERGE_SORTED_RUNS_H
-
-///////////////////////////////////////////////////////////////////////////
-/// \file tpie/merge_sorted_runs.h
-/// Contains the routine merge_sorted_runs used in several of TPIE's merge variants
-///////////////////////////////////////////////////////////////////////////
+// **************************************************************************
+// * *
+// * This include file contains the routine *
+// * merge_sorted_runs *
+// * used in several of TPIE's merge variants *
+// * *
+// **************************************************************************
+// $Id: merge_sorted_runs.h,v 1.2 2005-11-10 11:54:57 jan Exp $
// Get definitions for working with Unix and Windows
#include <portability.h>

0 comments on commit edd3720

Please sign in to comment.