5 Dec
2014
5 Dec
'14
10:24 p.m.
Author: hbelusca
Date: Fri Dec 5 22:24:49 2014
New Revision: 65570
URL: http://svn.reactos.org/svn/reactos?rev=65570&view=rev
Log:
Fix merge r65567.
Added:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
(props changed)
- copied unchanged from r65569,
trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c (props changed)
- copied unchanged from r65569, trunk/reactos/win32ss/user/winsrv/consrv/history.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c (props changed)
- copied unchanged from r65569, trunk/reactos/win32ss/user/winsrv/consrv/init.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c (props changed)
- copied unchanged from r65569, trunk/reactos/win32ss/user/winsrv/consrv/popup.c
Propchange:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 5 22:24:49 2014
@@ -0,0 +1,22 @@
+/branches/GSoC_2011/GSoC_Network/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:51548
+/branches/GSoC_2011/GSoC_TcpIpDriver/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:51550
+/branches/GSoC_2011/TcpIpDriver/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:51551-53074,53076-53119
+/branches/GSoC_Network/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:51545-51546
+/branches/cmake-bringup/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:50484,50693,50719,51544-52564
+/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:63104-64101
+/branches/header-work/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:45691-47721
+/branches/kd++/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:58883-58973
+/branches/kernel-fun/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:62304,62353,62531-62532,62853,64152,64173-64174,65253
+/branches/ntvdm/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:59241-63176
+/branches/reactos-yarotows/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:45219-46371,46373-48025,48027-49273
+/branches/reactx/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:49994-49995
+/branches/ros-amd64-bringup/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c: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/ros-amd64-bringup/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:36852
+/branches/ros-branch-0_3_15-lt2013/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:59059
+/branches/ros-csrss/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:57561-58762
+/branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:61927-65494
+/branches/shell32_new-bringup/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:51893-53652,53661,53700
+/branches/tcp-rewrite-branch/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:48720,48840-48841,49424-49426,49454
+/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
Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 5 22:24:49 2014
@@ -0,0 +1,22 @@
+/branches/GSoC_2011/GSoC_Network/win32ss/user/winsrv/consrv/history.c:51548
+/branches/GSoC_2011/GSoC_TcpIpDriver/win32ss/user/winsrv/consrv/history.c:51550
+/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/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
+/branches/ntvdm/win32ss/user/winsrv/consrv/history.c:59241-63176
+/branches/reactos-yarotows/win32ss/user/winsrv/consrv/history.c:45219-46371,46373-48025,48027-49273
+/branches/reactx/reactos/win32ss/user/winsrv/consrv/history.c:49994-49995
+/branches/ros-amd64-bringup/reactos/win32ss/user/winsrv/consrv/history.c: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/ros-amd64-bringup/win32ss/user/winsrv/consrv/history.c:36852
+/branches/ros-branch-0_3_15-lt2013/win32ss/user/winsrv/consrv/history.c:59059
+/branches/ros-csrss/win32ss/user/winsrv/consrv/history.c:57561-58762
+/branches/shell-experiments/win32ss/user/winsrv/consrv/history.c:61927-65494
+/branches/shell32_new-bringup/win32ss/user/winsrv/consrv/history.c:51893-53652,53661,53700
+/branches/tcp-rewrite-branch/win32ss/user/winsrv/consrv/history.c:48720,48840-48841,49424-49426,49454
+/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
Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 5 22:24:49 2014
@@ -0,0 +1,22 @@
+/branches/GSoC_2011/GSoC_Network/win32ss/user/winsrv/consrv/init.c:51548
+/branches/GSoC_2011/GSoC_TcpIpDriver/win32ss/user/winsrv/consrv/init.c:51550
+/branches/GSoC_2011/TcpIpDriver/win32ss/user/winsrv/consrv/init.c:51551-53074,53076-53119
+/branches/GSoC_Network/win32ss/user/winsrv/consrv/init.c:51545-51546
+/branches/cmake-bringup/win32ss/user/winsrv/consrv/init.c:50484,50693,50719,51544-52564
+/branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c:63104-64101
+/branches/header-work/win32ss/user/winsrv/consrv/init.c:45691-47721
+/branches/kd++/win32ss/user/winsrv/consrv/init.c:58883-58973
+/branches/kernel-fun/reactos/win32ss/user/winsrv/consrv/init.c:62304,62353,62531-62532,62853,64152,64173-64174,65253
+/branches/ntvdm/win32ss/user/winsrv/consrv/init.c:59241-63176
+/branches/reactos-yarotows/win32ss/user/winsrv/consrv/init.c:45219-46371,46373-48025,48027-49273
+/branches/reactx/reactos/win32ss/user/winsrv/consrv/init.c:49994-49995
+/branches/ros-amd64-bringup/reactos/win32ss/user/winsrv/consrv/init.c: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/ros-amd64-bringup/win32ss/user/winsrv/consrv/init.c:36852
+/branches/ros-branch-0_3_15-lt2013/win32ss/user/winsrv/consrv/init.c:59059
+/branches/ros-csrss/win32ss/user/winsrv/consrv/init.c:57561-58762
+/branches/shell-experiments/win32ss/user/winsrv/consrv/init.c:61927-65494
+/branches/shell32_new-bringup/win32ss/user/winsrv/consrv/init.c:51893-53652,53661,53700
+/branches/tcp-rewrite-branch/win32ss/user/winsrv/consrv/init.c:48720,48840-48841,49424-49426,49454
+/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
Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 5 22:24:49 2014
@@ -0,0 +1,22 @@
+/branches/GSoC_2011/GSoC_Network/win32ss/user/winsrv/consrv/popup.c:51548
+/branches/GSoC_2011/GSoC_TcpIpDriver/win32ss/user/winsrv/consrv/popup.c:51550
+/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/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
+/branches/ntvdm/win32ss/user/winsrv/consrv/popup.c:59241-63176
+/branches/reactos-yarotows/win32ss/user/winsrv/consrv/popup.c:45219-46371,46373-48025,48027-49273
+/branches/reactx/reactos/win32ss/user/winsrv/consrv/popup.c:49994-49995
+/branches/ros-amd64-bringup/reactos/win32ss/user/winsrv/consrv/popup.c: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/ros-amd64-bringup/win32ss/user/winsrv/consrv/popup.c:36852
+/branches/ros-branch-0_3_15-lt2013/win32ss/user/winsrv/consrv/popup.c:59059
+/branches/ros-csrss/win32ss/user/winsrv/consrv/popup.c:57561-58762
+/branches/shell-experiments/win32ss/user/winsrv/consrv/popup.c:61927-65494
+/branches/shell32_new-bringup/win32ss/user/winsrv/consrv/popup.c:51893-53652,53661,53700
+/branches/tcp-rewrite-branch/win32ss/user/winsrv/consrv/popup.c:48720,48840-48841,49424-49426,49454
+/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