diff options
| author | Pierre-Marie Pédrot | 2015-02-10 16:40:47 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2015-02-10 16:40:47 +0100 |
| commit | 956b7c4304582b1e9e3ca0bb34944bcbac18c0cc (patch) | |
| tree | b6c8bfaf58e1e4ad3397ff8136142001d433cdd9 /dev | |
| parent | a340265c9f88df990649481c8ecbe8a513ac4756 (diff) | |
| parent | 9360af713794cb9ecf3c5e7d686c6f486a65df7f (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/nsis/coq.nsi | 4 | ||||
| -rw-r--r-- | dev/top_printers.ml | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/dev/nsis/coq.nsi b/dev/nsis/coq.nsi index 90e3fdaa5c..5b421e49dd 100755 --- a/dev/nsis/coq.nsi +++ b/dev/nsis/coq.nsi @@ -196,14 +196,12 @@ SectionEnd Section "Uninstall" -;; We keep the settings -;; Delete "$INSTDIR\config\coqide-gtk2rc" - RMDir /r "$INSTDIR\bin" RMDir /r "$INSTDIR\dev" RMDir /r "$INSTDIR\etc" RMDir /r "$INSTDIR\lib" RMDir /r "$INSTDIR\share" + RMDir /r "$INSTDIR\ide" Delete "$INSTDIR\man\*.1" RMDir "$INSTDIR\man" diff --git a/dev/top_printers.ml b/dev/top_printers.ml index dea70360a5..650897ef74 100644 --- a/dev/top_printers.ml +++ b/dev/top_printers.ml @@ -22,7 +22,6 @@ open Evd open Goptions open Genarg open Clenv -open Universes let _ = Detyping.print_evar_arguments := true let _ = Detyping.print_universes := true |