Peter Simons aebfb40425 Revert "Don't use incompatible haddock-api." ...

This reverts commit 8fdcf556a1. I accidentally committed to the
wrong branch.

2016-05-27 19:18:31 +02:00

..

applications

Merge pull request #15710 from chris-martin/sublime-desktop-item

2016-05-27 16:57:32 +02:00

build-support

Merge branch 'staging'

2016-05-27 15:58:40 +02:00

data

Merge branch 'master' into staging

2016-05-26 16:50:22 +02:00

desktops

Merge branch 'staging'

2016-05-27 15:58:40 +02:00

development

Revert "Don't use incompatible haddock-api."

2016-05-27 19:18:31 +02:00

games

Merge branch 'master' into staging

2016-05-26 16:50:22 +02:00

misc

Merge branch 'master' into staging

2016-05-26 16:50:22 +02:00

os-specific

Merge branch 'staging'

2016-05-27 15:58:40 +02:00

servers

Merge branch 'staging'

2016-05-27 15:58:40 +02:00

shells

fish: use a different alias man_db -> man-db

2016-05-24 10:07:29 +02:00

stdenv

Allow not rebasing in cygwin stdenv.

2016-05-20 17:17:10 +02:00

test

Remove cruft

2016-04-26 17:31:54 +02:00

tools

Merge branch 'staging'

2016-05-27 15:58:40 +02:00

top-level

Merge pull request #15731 from earldouglas/picat

2016-05-27 17:07:04 +02:00