version id update

common/build_version.cpp

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

eeschema/sch_screen.cpp

@@ -498,7 +498,7 @@ void SCH_SCREEN::addConnectedItemsToBlock( const wxPoint& position )
     SCH_ITEM* item;
     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_PickedItemType = item->Type();

packaging/windows/nsis/install.nsi

@@ -17,7 +17,11 @@
 
 ; 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 ""

version.txt

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