[hbelusca] 65664: Fix some merging problems.

Author: hbelusca
Date: Sun Dec 14 23:39:03 2014
New Revision: 65664

URL: http://svn.reactos.org/svn/reactos?rev=65664&view=rev
Log:
Fix some merging problems.

Modified:
    branches/condrv_restructure/   (props changed)
    branches/condrv_restructure/dll/win32/kernel32/include/console.h
    branches/condrv_restructure/drivers/hid/hidparse/   (props changed)
    branches/condrv_restructure/drivers/hid/hidusb/   (props changed)
    branches/condrv_restructure/drivers/usb/usbehci/   (props changed)
    branches/condrv_restructure/drivers/usb/usbhub/   (props changed)
    branches/condrv_restructure/drivers/usb/usbohci/   (props changed)
    branches/condrv_restructure/lib/drivers/libusb/common_interfaces.h   (props changed)
    branches/condrv_restructure/lib/drivers/libusb/hcd_controller.cpp   (props changed)
    branches/condrv_restructure/lib/drivers/libusb/hub_controller.cpp   (props changed)
    branches/condrv_restructure/lib/drivers/libusb/libusb.cpp   (props changed)
    branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c  
(props changed)
    branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c   (props changed)
    branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c   (props changed)
    branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c   (props changed)

Propchange: branches/condrv_restructure/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -19,4 +19,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:63104-65660
+/trunk/reactos:63104-65662

Modified: branches/condrv_restructure/dll/win32/kernel32/include/console.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke…
==============================================================================
--- branches/condrv_restructure/dll/win32/kernel32/include/console.h	[iso-8859-1]
(original)
+++ branches/condrv_restructure/dll/win32/kernel32/include/console.h	[iso-8859-1] Sun Dec
14 23:39:03 2014
@@ -13,10 +13,6 @@
 #define HANDLE_DETACHED_PROCESS     (HANDLE)-1
 #define HANDLE_CREATE_NEW_CONSOLE   (HANDLE)-2
 #define HANDLE_CREATE_NO_WINDOW     (HANDLE)-3
-
-// Enable (and then get rid of) this define when support for
-// console initialization handles is implemented in CONSRV.
-// #define USE_CONSOLE_INIT_HANDLES
 
 
 /* FUNCTION PROTOTYPES ********************************************************/

Propchange: branches/condrv_restructure/drivers/hid/hidparse/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -18,5 +18,5 @@

/branches/usb-bringup/drivers/hid/hidparse:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54757-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk/drivers/hid/hidparse:55548-55554
 /branches/wlan-bringup/drivers/hid/hidparse:54809-54998
-/trunk/reactos/drivers/hid/hidparse:63104-65566
+/trunk/reactos/drivers/hid/hidparse:63104-65662
 /trunk/reactos/drivers/usb/hidparse:48236-51323

Propchange: branches/condrv_restructure/drivers/hid/hidusb/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -15,8 +15,8 @@

/branches/ros-amd64-bringup/reactos/drivers/usb/hidusb:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
 /branches/shell32_new-bringup/drivers/hid/hidusb:51893-53652,53661,53700
 /branches/tcp-rewrite-branch/drivers/hid/hidusb:48720,48840-48841,49424-49426,49454
-/branches/usb-bringup/drivers/hid/hidusb:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
-/branches/usb-bringup-trunk/drivers/hid/hidusb:55020-55543,55548-55554
+/branches/usb-bringup/drivers/hid/hidusb:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54753,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
+/branches/usb-bringup-trunk/drivers/hid/hidusb:55548-55554
 /branches/wlan-bringup/drivers/hid/hidusb:54809-54998
-/trunk/reactos/drivers/hid/hidusb:63104-65566
+/trunk/reactos/drivers/hid/hidusb:63104-65662
 /trunk/reactos/drivers/usb/hidusb:48236-51323

Propchange: branches/condrv_restructure/drivers/usb/usbehci/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -27,4 +27,4 @@
 /branches/usb-bringup-trunk/drivers/usb/usbehci:55548-55554,55556-55567
 /branches/wlan-bringup/drivers/usb/usbehci:54809-54998
 /branches/wlan-bringup/drivers/usb/usbehci_new:54809-54998
-/trunk/reactos/drivers/usb/usbehci:63104-65566
+/trunk/reactos/drivers/usb/usbehci:63104-65662

Propchange: branches/condrv_restructure/drivers/usb/usbhub/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -27,4 +27,4 @@
 /branches/usb-bringup-trunk/drivers/usb/usbhub:55548-55554
 /branches/wlan-bringup/drivers/usb/usbhub:54809-54998
 /branches/wlan-bringup/drivers/usb/usbhub_new:54809-54998
-/trunk/reactos/drivers/usb/usbhub:63104-65566
+/trunk/reactos/drivers/usb/usbhub:63104-65662

Propchange: branches/condrv_restructure/drivers/usb/usbohci/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -19,4 +19,4 @@
 /branches/usb-bringup-trunk/drivers/usb/usbohci:55548-55554
 /branches/wlan-bringup/drivers/usb/usbohci:54809-54998
 /trunk/reactos/drivers/usb/usbehci_new:48236-51323
-/trunk/reactos/drivers/usb/usbohci:63104-65566
+/trunk/reactos/drivers/usb/usbohci:63104-65662

Propchange: branches/condrv_restructure/lib/drivers/libusb/common_interfaces.h
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -27,4 +27,4 @@
 /branches/usb-bringup-trunk/drivers/usb/usbehci/interfaces.h:55548-55554,55556-55567
 /branches/wlan-bringup/drivers/usb/usbehci/interfaces.h:54809-54998
 /branches/wlan-bringup/drivers/usb/usbehci_new/interfaces.h:54809-54998
-/trunk/reactos/lib/drivers/libusb/common_interfaces.h:63104-65566
+/trunk/reactos/lib/drivers/libusb/common_interfaces.h:63104-65662

Propchange: branches/condrv_restructure/lib/drivers/libusb/hcd_controller.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -27,4 +27,4 @@

/branches/usb-bringup-trunk/drivers/usb/usbehci/hcd_controller.cpp:55548-55554,55556-55567
 /branches/wlan-bringup/drivers/usb/usbehci/hcd_controller.cpp:54809-54998
 /branches/wlan-bringup/drivers/usb/usbehci_new/hcd_controller.cpp:54809-54998
-/trunk/reactos/lib/drivers/libusb/hcd_controller.cpp:63104-65566
+/trunk/reactos/lib/drivers/libusb/hcd_controller.cpp:63104-65662

Propchange: branches/condrv_restructure/lib/drivers/libusb/hub_controller.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -27,4 +27,4 @@

/branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp:55548-55554,55556-55567
 /branches/wlan-bringup/drivers/usb/usbehci/hub_controller.cpp:54809-54998
 /branches/wlan-bringup/drivers/usb/usbehci_new/hub_controller.cpp:54809-54998
-/trunk/reactos/lib/drivers/libusb/hub_controller.cpp:63104-65566
+/trunk/reactos/lib/drivers/libusb/hub_controller.cpp:63104-65662

Propchange: branches/condrv_restructure/lib/drivers/libusb/libusb.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -27,4 +27,4 @@
 /branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.cpp:55548-55554,55556-55567
 /branches/wlan-bringup/drivers/usb/usbehci/usbehci.cpp:54809-54998
 /branches/wlan-bringup/drivers/usb/usbehci_new/usbehci.cpp:54809-54998
-/trunk/reactos/lib/drivers/libusb/libusb.cpp:63104-65566
+/trunk/reactos/lib/drivers/libusb/libusb.cpp:63104-65662

Propchange:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -20,4 +20,4 @@

/branches/usb-bringup/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

/branches/usb-bringup-trunk/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:54809-54998
-/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:63104-65660
+/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:63104-65662

Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -3,7 +3,7 @@

/branches/GSoC_2011/TcpIpDriver/win32ss/user/winsrv/consrv/history.c:51551-53074,53076-53119
 /branches/GSoC_Network/win32ss/user/winsrv/consrv/history.c:51545-51546

/branches/cmake-bringup/win32ss/user/winsrv/consrv/history.c:50484,50693,50719,51544-52564
-/branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c:63104-64101
+/branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c:63104-63977
 /branches/header-work/win32ss/user/winsrv/consrv/history.c:45691-47721
 /branches/kd++/win32ss/user/winsrv/consrv/history.c:58883-58973

/branches/kernel-fun/reactos/win32ss/user/winsrv/consrv/history.c:62304,62353,62531-62532,62853,64152,64173-64174,65253
@@ -20,4 +20,4 @@

/branches/usb-bringup/win32ss/user/winsrv/consrv/history.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

/branches/usb-bringup-trunk/win32ss/user/winsrv/consrv/history.c:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/win32ss/user/winsrv/consrv/history.c:54809-54998
-/trunk/reactos/win32ss/user/winsrv/consrv/history.c:64102-65660
+/trunk/reactos/win32ss/user/winsrv/consrv/history.c:64102-65662

Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -20,4 +20,4 @@

/branches/usb-bringup/win32ss/user/winsrv/consrv/init.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

/branches/usb-bringup-trunk/win32ss/user/winsrv/consrv/init.c:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/win32ss/user/winsrv/consrv/init.c:54809-54998
-/trunk/reactos/win32ss/user/winsrv/consrv/init.c:63104-65660
+/trunk/reactos/win32ss/user/winsrv/consrv/init.c:63104-65662

Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:39:03 2014
@@ -3,7 +3,7 @@

/branches/GSoC_2011/TcpIpDriver/win32ss/user/winsrv/consrv/popup.c:51551-53074,53076-53119
 /branches/GSoC_Network/win32ss/user/winsrv/consrv/popup.c:51545-51546
 /branches/cmake-bringup/win32ss/user/winsrv/consrv/popup.c:50484,50693,50719,51544-52564
-/branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c:63104-64101
+/branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c:63104-63991
 /branches/header-work/win32ss/user/winsrv/consrv/popup.c:45691-47721
 /branches/kd++/win32ss/user/winsrv/consrv/popup.c:58883-58973

/branches/kernel-fun/reactos/win32ss/user/winsrv/consrv/popup.c:62304,62353,62531-62532,62853,64152,64173-64174,65253
@@ -20,4 +20,4 @@

/branches/usb-bringup/win32ss/user/winsrv/consrv/popup.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

/branches/usb-bringup-trunk/win32ss/user/winsrv/consrv/popup.c:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/win32ss/user/winsrv/consrv/popup.c:54809-54998
-/trunk/reactos/win32ss/user/winsrv/consrv/popup.c:64102-65660
+/trunk/reactos/win32ss/user/winsrv/consrv/popup.c:64102-65662