[fireball] 45100: Merge: - 45097: "Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32)". - 45098: "Merge Wine-1.1.36 changes to commctrl.h." - 45099: "Add missing IIDs to UUID."
16 Jan
2010
16 Jan
'10
1:55 p.m.
Author: fireball
Date: Sat Jan 16 14:55:35 2010
New Revision: 45100
URL: http://svn.reactos.org/svn/reactos?rev=45100&view=rev
Log:
Merge:
- 45097: "Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32)".
- 45098: "Merge Wine-1.1.36 changes to commctrl.h."
- 45099: "Add missing IIDs to UUID."
Added:
branches/arwinss/reactos/include/psdk/commoncontrols.idl
- copied unchanged from r45097, trunk/reactos/include/psdk/commoncontrols.idl
Modified:
branches/arwinss/ (props changed)
branches/arwinss/reactos/ (props changed)
branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed)
branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed)
branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed)
branches/arwinss/reactos/dll/win32/gdi32/ (props changed)
branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed)
branches/arwinss/reactos/dll/win32/user32/ (props changed)
branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed)
branches/arwinss/reactos/include/ndk/amd64/ (props changed)
branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed)
branches/arwinss/reactos/include/psdk/ (props changed)
branches/arwinss/reactos/include/psdk/commctrl.h (contents, props changed)
branches/arwinss/reactos/include/psdk/psdk.rbuild
branches/arwinss/reactos/lib/sdk/crt/time/ (props changed)
branches/arwinss/reactos/lib/sdk/uuid/uuid.c
branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props
changed)
branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed)
branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed)
branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed)
branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed)
branches/arwinss/reactos/tools/rsym/log2lines.c (props changed)
branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed)
branches/arwinss/reactos/tools/rsym/rsym.c (props changed)
branches/arwinss/reactos/tools/rsym/rsym.h (props changed)
branches/arwinss/reactos/tools/rsym/rsym.mak (props changed)
branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed)
branches/arwinss/rosapps/applications/cmdutils/ (props changed)
branches/arwinss/rosapps/applications/devutils/ (props changed)
branches/arwinss/rosapps/applications/fraginator/ (props changed)
branches/arwinss/rosapps/applications/net/ (props changed)
branches/arwinss/rosapps/applications/net/roshttpd/ (props changed)
branches/arwinss/rosapps/applications/notevil/ (props changed)
branches/arwinss/rosapps/applications/sysutils/ (props changed)
branches/arwinss/rosapps/applications/sysutils/gettype/ (props changed)
branches/arwinss/rosapps/applications/sysutils/logevent/ (props changed)
branches/arwinss/rosapps/applications/sysutils/screenshot/ (props changed)
branches/arwinss/rosapps/applications/winfile/ (props changed)
branches/arwinss/rosapps/lib/win32err/ (props changed)
branches/arwinss/rosapps/lib/win32err/win32err.rbuild (props changed)
branches/arwinss/rosapps/templates/imagesoft/ (props changed)
branches/arwinss/rosapps/templates/imagesoft/lang/no-NO.rc (props changed)
branches/arwinss/rosapps/templates/old_wordpad/ (props changed)
branches/arwinss/rosapps/templates/old_wordpad/lang/no-NO.rc (props changed)
branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README (props changed)
branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README.odt (props changed)
branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh (props changed)
branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/scripts/ (props changed)
branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/sources/ (props changed)
branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/tools/ (props changed)
branches/arwinss/wallpaper/Angelus_02_ROSWP.bmp (props changed)
branches/arwinss/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg (props changed)
Propchange: branches/arwinss/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,1 +1,1 @@
-/trunk:42678-43126
+/trunk:42678-43126,45097-45099
Propchange: branches/arwinss/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos:42000-43670
+/trunk/reactos:42000-43670,45097-45099
Propchange: branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-43670
+/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-43670,45097-45099
Propchange: branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-43670
+/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-43670,45097-45099
Propchange: branches/arwinss/reactos/dll/shellext/slayer/slayer.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-43670
+/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-43670,45097-45099
Propchange: branches/arwinss/reactos/dll/win32/gdi32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/win32/gdi32:42000-43670
+/trunk/reactos/dll/win32/gdi32:42000-43670,45097-45099
/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044
Propchange: branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-43670,44261
+/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-43670,44261,45097-45099
Propchange: branches/arwinss/reactos/dll/win32/user32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/win32/user32:42000-43670
+/trunk/reactos/dll/win32/user32:42000-43670,45097-45099
/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044
Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/win32/winex11.drv:42000-43670
+/trunk/reactos/dll/win32/winex11.drv:42000-43670,45097-45099
/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044
Propchange: branches/arwinss/reactos/include/ndk/amd64/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34925,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35739,35823,35952,35966,36360,37323,37434,37472,37475,37536,37820-37821,37869,37990,38013-38014,43426,43454
-/trunk/reactos/include/ndk/amd64:43125-43670
+/trunk/reactos/include/ndk/amd64:43125-43670,45097-45099
Propchange: branches/arwinss/reactos/include/ndk/amd64/asmmacro.S
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,1 +1,2 @@
/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:37475,37536,37820-37821,37869,37990,38013-38014,43426,43454
+/trunk/reactos/include/ndk/amd64/asmmacro.S:45097-45099
Propchange: branches/arwinss/reactos/include/psdk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/include/psdk:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/include/psdk:42000-43670,44153
+/trunk/reactos/include/psdk:42000-43670,44153,45097-45099
Modified: branches/arwinss/reactos/include/psdk/commctrl.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/co…
==============================================================================
--- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Jan 16 14:55:35
2010
@@ -2991,6 +2991,7 @@
#define LVSIL_NORMAL 0
#define LVSIL_SMALL 1
#define LVSIL_STATE 2
+#define LVSIL_GROUPHEADER 3
/* following 2 flags only for LVS_OWNERDATA listviews */
/* and only in report or list mode */
@@ -2998,11 +2999,12 @@
#define LVSICF_NOSCROLL 0x0002
-#define LVFI_PARAM 0X0001
-#define LVFI_STRING 0X0002
-#define LVFI_PARTIAL 0X0008
-#define LVFI_WRAP 0X0020
-#define LVFI_NEARESTXY 0X0040
+#define LVFI_PARAM 0x0001
+#define LVFI_STRING 0x0002
+#define LVFI_SUBSTRING 0x0004
+#define LVFI_PARTIAL 0x0008
+#define LVFI_WRAP 0x0020
+#define LVFI_NEARESTXY 0x0040
#define LVIF_TEXT 0x0001
#define LVIF_IMAGE 0x0002
@@ -5133,7 +5135,7 @@
#define WC_EDIT WINELIB_NAME_AW(WC_EDIT)
/**************************************************************************
- * List box control
+ * Listbox control
*/
#define WC_LISTBOXA "ListBox"
@@ -5147,7 +5149,7 @@
#define WC_LISTBOX WINELIB_NAME_AW(WC_LISTBOX)
/**************************************************************************
- * Scroll bar control
+ * Scrollbar control
*/
#define WC_SCROLLBARA "ScrollBar"
Propchange: branches/arwinss/reactos/include/psdk/commctrl.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015,44019,44153
+/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015,44019,44153,45097-45099
Modified: branches/arwinss/reactos/include/psdk/psdk.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ps…
==============================================================================
--- branches/arwinss/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sat Jan 16 14:55:35
2010
@@ -6,6 +6,7 @@
<file>activscp.idl</file>
<file>bits1_5.idl</file>
<file>bits.idl</file>
+ <file>commoncontrols.idl</file>
<file>control.idl</file>
<file>ctxtcall.idl</file>
<file>dimm.idl</file>
Propchange: branches/arwinss/reactos/lib/sdk/crt/time/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,4 +1,4 @@
/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:38268,41028
/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414
-/trunk/reactos/lib/sdk/crt/time:42678-43670
+/trunk/reactos/lib/sdk/crt/time:42678-43670,45097-45099
/trunk/reactos/lib/sdk/crt/time_new:39350-42241,42401-42678
Modified: branches/arwinss/reactos/lib/sdk/uuid/uuid.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/uuid/uu…
==============================================================================
--- branches/arwinss/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sat Jan 16 14:55:35 2010
@@ -77,6 +77,12 @@
#include "isguids.h"
#include "objsafe.h"
#include "perhist.h"
+#include "netcon.h"
+#include "netfw.h"
+#include "msctf.h"
+#include "sensevts.h"
+#include "ocmm.h"
+#include "commoncontrols.h"
/* FIXME: cguids declares GUIDs but does not define their values */
Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-43670,43934-43935
+/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-43670,43934-43935,45097-45099
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/subsystems/win32/win32k/include:42000-43670
+/trunk/reactos/subsystems/win32/win32k/include:42000-43670,45097-45099
/vendor/wine/server/current:45044
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-43670
+/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-43670,45097-45099
/vendor/wine/server/current/request.h:43136,43398,43708,45044
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/user.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126
+/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,45097-45099
/vendor/wine/server/current/user.h:43708,45044
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/subsystems/win32/win32k/wine:42000-43126
+/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,45097-45099
/vendor/wine/server/current:43708,44715,45044
Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:38268,41028
-/trunk/reactos/tools/rsym/log2lines.c:43125-43670
+/trunk/reactos/tools/rsym/log2lines.c:43125-43670,45097-45099
Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:38268,41028
-/trunk/reactos/tools/rsym/log2lines.mak:43125-43670
+/trunk/reactos/tools/rsym/log2lines.mak:43125-43670,45097-45099
Propchange: branches/arwinss/reactos/tools/rsym/rsym.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028
-/trunk/reactos/tools/rsym/rsym.c:42000-43670
+/trunk/reactos/tools/rsym/rsym.c:42000-43670,45097-45099
Propchange: branches/arwinss/reactos/tools/rsym/rsym.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028
-/trunk/reactos/tools/rsym/rsym.h:42000-43670
+/trunk/reactos/tools/rsym/rsym.h:42000-43670,45097-45099
Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028
-/trunk/reactos/tools/rsym/rsym.mak:42000-43670
+/trunk/reactos/tools/rsym/rsym.mak:42000-43670,45097-45099
Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028
-/trunk/reactos/tools/rsym/rsym_common.c:42000-43670
+/trunk/reactos/tools/rsym/rsym_common.c:42000-43670,45097-45099
Propchange: branches/arwinss/rosapps/applications/cmdutils/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/applications/cmdutils:45097-45099
Propchange: branches/arwinss/rosapps/applications/devutils/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/applications/devutils:45097-45099
Propchange: branches/arwinss/rosapps/applications/fraginator/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/applications/fraginator:45097-45099
Propchange: branches/arwinss/rosapps/applications/net/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/applications/net:45097-45099
Propchange: branches/arwinss/rosapps/applications/net/roshttpd/
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/rosapps/applications/notevil/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/applications/notevil:45097-45099
Propchange: branches/arwinss/rosapps/applications/sysutils/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/applications/sysutils:45097-45099
Propchange: branches/arwinss/rosapps/applications/sysutils/gettype/
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/rosapps/applications/sysutils/logevent/
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/rosapps/applications/sysutils/screenshot/
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/rosapps/applications/winfile/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/applications/winfile:45097-45099
Propchange: branches/arwinss/rosapps/lib/win32err/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/lib/win32err:45097-45099
Propchange: branches/arwinss/rosapps/lib/win32err/win32err.rbuild
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/rosapps/templates/imagesoft/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/templates/imagesoft:45097-45099
Propchange: branches/arwinss/rosapps/templates/imagesoft/lang/no-NO.rc
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/rosapps/templates/old_wordpad/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/rosapps/templates/old_wordpad:45097-45099
Propchange: branches/arwinss/rosapps/templates/old_wordpad/lang/no-NO.rc
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/tools/RosBE/RosBE-Unix/Base-i386/README:45097-45099
Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README.odt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt:45097-45099
Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh:45097-45099
Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/scripts/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts:45097-45099
Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/sources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/tools/RosBE/RosBE-Unix/Base-i386/sources:45097-45099
Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/tools/RosBE/RosBE-Unix/Base-i386/tools:45097-45099
Propchange: branches/arwinss/wallpaper/Angelus_02_ROSWP.bmp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/wallpaper/Angelus_02_ROSWP.bmp:45097-45099
Propchange: branches/arwinss/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 14:55:35 2010
@@ -1,0 +1,1 @@
+/trunk/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg:45097-45099
5464
days inactive
5464
days old
0 comments
1 participants
participants (1)
-
fireball＠svn.reactos.org