diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-22 17:46:37 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-22 17:48:45 +0100 |
| commit | 3c191ef6ef857c92b9962a72731482fb29ddfb7f (patch) | |
| tree | 38f32cca428d80fe0098f7009250877e35a1e328 /haddock-api/resources | |
| parent | 7c7468c3a0cb2fa398379ea8ea019b8230229c1c (diff) | |
| parent | b94ab9034367f51b978904d60f2604db10abbd9f (diff) | |
Reset ghc-head with master's tree
(this is an overwriting git merge of master into ghc-head)
Diffstat (limited to 'haddock-api/resources')
0 files changed, 0 insertions, 0 deletions