Resolve conflict master
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>
Wed, 10 Oct 2012 22:21:23 +0000 (22:21 +0000)
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>
Wed, 10 Oct 2012 22:21:23 +0000 (22:21 +0000)
commite2af5249119f7199e5f5321982637ed0e6c53e91
tree7e5902f7ad8282c152e1c4e09511d3f2044ae87a
parent34cf6a0a5c7addc29bb107a2864d609edbdd822f
Resolve conflict
benchmarks/vector-benchmarks.cabal
tests/vector-tests.cabal
vector.cabal