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

version id update

This commit is contained in:
jean-pierre charras 2011-01-08 20:03:27 +01:00
parent 7e1745da56 2ba076f7bc
commit 2efd4b399f
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build_version.cpp
View File

@ -6,7 +6,7 @@
#endif #endif
#ifndef KICAD_BUILD_VERSION #ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION "(2010-12-23 BZR 2682)" #define KICAD_BUILD_VERSION "(2011-01-07 BZR 2718)"
#endif #endif
//#define VERSION_STABILITY "stable" //#define VERSION_STABILITY "stable"

2
eeschema/sch_screen.cpp
View File

@ -498,7 +498,7 @@ void SCH_SCREEN::addConnectedItemsToBlock( const wxPoint& position )
SCH_ITEM* item; SCH_ITEM* item;
ITEM_PICKER picker; ITEM_PICKER picker;
for( item = GetDrawItems(); item != NULL; item = item = item->Next() ) for( item = GetDrawItems(); item != NULL; item = item->Next() )
{ {
picker.m_PickedItem = item; picker.m_PickedItem = item;
picker.m_PickedItemType = item->Type(); picker.m_PickedItemType = item->Type();

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

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

4
version.txt
View File

@ -1,4 +1,4 @@
release version: release version:
2010 dec 23 (BZR 2682) 2011 jan 07 (BZR 2718)
files (.zip,.tgz): files (.zip,.tgz):
kicad-2010-12-23 kicad-2011-01-07