haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix install.nsi conflict error

This commit is contained in:
jean-pierre charras 2011-01-08 20:08:13 +01:00
parent 2efd4b399f
commit 58dcc12ebb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/windows/nsis/install.nsi
View File

@ -17,11 +17,7 @@
; General Product Description Definitions
!define PRODUCT_NAME "KiCad"
<<<<<<< TREE
!define PRODUCT_VERSION "2011.01.07"
=======
!define PRODUCT_VERSION "2010.12.22"
>>>>>>> MERGE-SOURCE
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME ""