[commit: packages/containers] changelog-foldtree, cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-184-generic, revert-408-bugfix_394: Merge pull request #110 from int-e/bench (55f65cd)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/containers

On branches: changelog-foldtree,cleaned_bugfix394,master,merge-doc-target,merge-fixes-5.9,merge-restrict-fix-5.8,revert-184-generic,revert-408-bugfix_394
Link       : http://git.haskell.org/packages/containers.git/commitdiff/55f65cddc15bb30149795de2c5498e428381f2d2

>---------------------------------------------------------------

commit 55f65cddc15bb30149795de2c5498e428381f2d2
Merge: 924fafe 5364bea
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 22 17:56:05 2014 +0100

    Merge pull request #110 from int-e/bench
    
    update benchmarks for criterion-1.0



>---------------------------------------------------------------

55f65cddc15bb30149795de2c5498e428381f2d2
 benchmarks/IntMap.hs   | 6 ++----
 benchmarks/IntSet.hs   | 6 ++----
 benchmarks/Makefile    | 6 ++++--
 benchmarks/Map.hs      | 6 ++----
 benchmarks/Sequence.hs | 7 ++++---
 benchmarks/Set.hs      | 6 ++----
 6 files changed, 16 insertions(+), 21 deletions(-)