aboutsummaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorAlec Theriault <alec.theriault@gmail.com>2018-11-10 16:02:13 -0800
committerAlec Theriault <alec.theriault@gmail.com>2018-11-10 16:02:13 -0800
commit959033d592b41235896402a64703650df77c34bd (patch)
tree352d1c64c354017adc5b7c3c6aa7aa7fd95e1bf6 /ghc.mk
parentb62c9542480d629bb482f5394dec2fdd5a48af24 (diff)
parentf4d53a159642aa9182241259709659e7074425d5 (diff)
Merge branch 'ghc-8.6' into ghc-head
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk12
1 files changed, 7 insertions, 5 deletions
diff --git a/ghc.mk b/ghc.mk
index 4bcc4b18..d3b02b6e 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -40,11 +40,13 @@ utils/haddock_dist_DATA_FILES += html/Classic.theme/haskell_icon.gif
utils/haddock_dist_DATA_FILES += html/Classic.theme/minus.gif
utils/haddock_dist_DATA_FILES += html/Classic.theme/plus.gif
utils/haddock_dist_DATA_FILES += html/Classic.theme/xhaddock.css
-utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/hslogo-16.png
-utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/minus.gif
-utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/ocean.css
-utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/plus.gif
-utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/synopsis.png
+utils/haddock_dist_DATA_FILES += html/Ocean.theme/hslogo-16.png
+utils/haddock_dist_DATA_FILES += html/Ocean.theme/minus.gif
+utils/haddock_dist_DATA_FILES += html/Ocean.theme/ocean.css
+utils/haddock_dist_DATA_FILES += html/Ocean.theme/plus.gif
+utils/haddock_dist_DATA_FILES += html/Ocean.theme/synopsis.png
+utils/haddock_dist_DATA_FILES += html/NewOcean.std-theme/new-ocean.css
+utils/haddock_dist_DATA_FILES += html/NewOcean.std-theme/synopsis.png
utils/haddock_dist_DATA_FILES += html/solarized.css
utils/haddock_dist_DATA_FILES += html/highlight.js
utils/haddock_dist_DATA_FILES += latex/haddock.sty