Permalink
Browse files

Merge new hash array mapped trie implementation

This essentially wipes out the old implementation.

Conflicts:
	Data/HashMap/Array.hs
	Data/HashMap/Internal.hs
	Data/HashMap/PopCount.hs
	Data/HashMap/UnsafeShift.hs
	cbits/popc.c
  • Loading branch information...
2 parents 1af9621 + 6107e1b commit 7eb69989a61f29f88e1e901f52f8cae356422e83 @tibbe committed Mar 7, 2012
View
@@ -4,6 +4,5 @@
*.prof
*.tix
.hpc/
-/benchmarks/bench
+/benchmarks/dist/*
/dist/*
-/tests/tests
Oops, something went wrong.

0 comments on commit 7eb6998

Please sign in to comment.