Commit 87a01d22 authored by judah's avatar judah
Browse files

Merge branch 'asr-master'

Conflicts:
	haskeline.cabal
parents 9d032a3a bcc1b818
GNUmakefile
dist/
dist-install
ghc.mk
Name: haskeline
Cabal-Version: >=1.16
Cabal-Version: >=1.10
Version: 0.7.2.0
Category: User Interfaces
License: BSD3
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment