Merge remote-tracking branch 'upstream/devel' into devel

This commit is contained in:
PhilipWitte 2015-02-15 17:27:53 -08:00
commit 0e5f6cc3b0
39 changed files with 260 additions and 259 deletions

View file

@ -50,8 +50,8 @@
SetCompressor /SOLID /FINAL lzma
; Installer and Uninstaller Icons
; Icon "nimrod.ico"
; UninstallIcon "nimrod.ico"
; Icon "nim.ico"
; UninstallIcon "nim.ico"
; Set installation details to be shown by default
ShowInstDetails show