Author: akhaldi Date: Mon Jan 18 13:17:43 2016 New Revision: 70613
URL: http://svn.reactos.org/svn/reactos?rev=70613&view=rev Log: [0.4.0] * And of course we need Hermès' lovely New Year celebration in r70477 ;)
Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.bmp branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.svg branches/ros-branch-0_4_0/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake branches/ros-branch-0_4_0/reactos/ntoskrnl/inbv/logo/1.bmp
Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 18 13:17:43 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606
Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 18 13:17:43 2016 @@ -20,4 +20,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:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606
Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/win... ============================================================================== Binary files - no diff available.
Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.svg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/win... ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] Mon Jan 18 13:17:43 2016 @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2015 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2016 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501">
Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/win... ============================================================================== Binary files - no diff available.
Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/include... ============================================================================== --- branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] Mon Jan 18 13:17:43 2016 @@ -19,7 +19,7 @@ set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") -set(COPYRIGHT_YEAR "2015") +set(COPYRIGHT_YEAR "2016") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "")
Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/include... ============================================================================== --- branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake [iso-8859-1] Mon Jan 18 13:17:43 2016 @@ -25,7 +25,6 @@ /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ #define KERNEL_VERSION_BUILD_TYPE "@KERNEL_VERSION_BUILD_TYPE@"
- #endif
/* EOF */
Modified: branches/ros-branch-0_4_0/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/ntoskrn... ============================================================================== Binary files - no diff available.