diff options
| author | David Waern <david.waern@gmail.com> | 2011-12-27 13:33:41 +0100 | 
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2011-12-27 13:33:41 +0100 | 
| commit | 12e619d5b00d205443768c224da2bfb045569590 (patch) | |
| tree | 4c50f7e3a3d8e34b70b6d6b80dd42d191284ba50 /src/Documentation | |
| parent | 505df72e9e0962e01cf031f799d8d8940ced73b1 (diff) | |
| parent | 60a043541e062ff6ceb52b0ab9e4f67d79dd3754 (diff) | |
Merge ../../../haddock
Conflicts:
	src/Haddock/InterfaceFile.hs
Diffstat (limited to 'src/Documentation')
| -rw-r--r-- | src/Documentation/Haddock.hs | 1 | 
1 files changed, 0 insertions, 1 deletions
| diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs index 96198494..052f1044 100644 --- a/src/Documentation/Haddock.hs +++ b/src/Documentation/Haddock.hs @@ -22,7 +22,6 @@ module Documentation.Haddock (    -- * Export items & declarations    ExportItem(..),    Decl, -  DeclInfo,    DocForDecl,    FnArgsDoc, | 
