[ros-diffs] [zguo] 58884: Incorporate version info and wallpapers.

Author: zguo
Date: Sun Apr 28 16:16:28 2013
New Revision: 58884

URL: http://svn.reactos.org/svn/reactos?rev=58884&view=rev
Log:
Incorporate version info and wallpapers.

Added:
    branches/ReactOS-0.3.15/modules/wallpaper/   (with props)
    branches/ReactOS-0.3.15/modules/wallpaper/Angelus_02_ROSWP.bmp   (with props)
    branches/ReactOS-0.3.15/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp   (with
props)
    branches/ReactOS-0.3.15/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp  
(with props)
    branches/ReactOS-0.3.15/modules/wallpaper/CMakeLists.txt   (with props)
    branches/ReactOS-0.3.15/modules/wallpaper/RainInTheScreen_4x3.bmp   (with props)
    branches/ReactOS-0.3.15/modules/wallpaper/ReadMe.txt   (with props)
Modified:
    branches/ReactOS-0.3.15/boot/bootdata/hivedef.inf
    branches/ReactOS-0.3.15/include/reactos/version.cmake

Modified: branches/ReactOS-0.3.15/boot/bootdata/hivedef.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/boot/bootdata/hi…
==============================================================================
--- branches/ReactOS-0.3.15/boot/bootdata/hivedef.inf [iso-8859-1] (original)
+++ branches/ReactOS-0.3.15/boot/bootdata/hivedef.inf [iso-8859-1] Sun Apr 28 16:16:28
2013
@@ -95,7 +95,7 @@
 HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1"
 HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600"
 HKCU,"Control
Panel\Desktop","WaitToKillAppTimeout",2,"20000"
-HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
+HKCU,"Control
Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus_02_ROSWP.bmp"
 HKCU,"Control Panel\Desktop","FontSmoothing",0,"1"
 HKCU,"Control
Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001
 HKCU,"Control
Panel\Desktop","FontSmoothingType",0x00010003,0x00000001

Modified: branches/ReactOS-0.3.15/include/reactos/version.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/include/reactos/…
==============================================================================
--- branches/ReactOS-0.3.15/include/reactos/version.cmake [iso-8859-1] (original)
+++ branches/ReactOS-0.3.15/include/reactos/version.cmake [iso-8859-1] Sun Apr 28 16:16:28
2013
@@ -30,11 +30,11 @@
 today(KERNEL_VERSION_BUILD)
 
 set(KERNEL_VERSION_MAJOR "0")
-set(KERNEL_VERSION_MINOR "4")
-set(KERNEL_VERSION_PATCH_LEVEL "0")
+set(KERNEL_VERSION_MINOR "3")
+set(KERNEL_VERSION_PATCH_LEVEL "15")
 set(COPYRIGHT_YEAR "2013")
 # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or
"" (for the release)
-set(KERNEL_VERSION_BUILD_TYPE "SVN")
+set(KERNEL_VERSION_BUILD_TYPE "")
 
 
 set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun Apr 28 16:16:28 2013
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: branches/ReactOS-0.3.15/modules/wallpaper/Angelus_02_ROSWP.bmp
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/modules/wallpape…
==============================================================================
Binary file - no diff available.

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/Angelus_02_ROSWP.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: branches/ReactOS-0.3.15/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/modules/wallpape…
==============================================================================
Binary file - no diff available.

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: branches/ReactOS-0.3.15/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/modules/wallpape…
==============================================================================
Binary file - no diff available.

Propchange:
branches/ReactOS-0.3.15/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: branches/ReactOS-0.3.15/modules/wallpaper/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/modules/wallpape…
==============================================================================
--- branches/ReactOS-0.3.15/modules/wallpaper/CMakeLists.txt (added)
+++ branches/ReactOS-0.3.15/modules/wallpaper/CMakeLists.txt [iso-8859-1] Sun Apr 28
16:16:28 2013
@@ -1,0 +1,4 @@
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_ReactOS7_Dark_4-3.bmp DESTINATION
reactos FOR all)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP.bmp DESTINATION reactos FOR
all)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_Sea04_FarBeyondTheSea_4x3.bmp
DESTINATION reactos FOR all)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/RainInTheScreen_4x3.bmp DESTINATION reactos
FOR all)

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/ReactOS-0.3.15/modules/wallpaper/RainInTheScreen_4x3.bmp
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/modules/wallpape…
==============================================================================
Binary file - no diff available.

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/RainInTheScreen_4x3.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: branches/ReactOS-0.3.15/modules/wallpaper/ReadMe.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/modules/wallpape…
==============================================================================
--- branches/ReactOS-0.3.15/modules/wallpaper/ReadMe.txt (added)
+++ branches/ReactOS-0.3.15/modules/wallpaper/ReadMe.txt [iso-8859-1] Sun Apr 28 16:16:28
2013
@@ -1,0 +1,8 @@
+Wallpapers
+===========
+
+File Name                           | Author                                         |
Origin
+--------------------------------------------------------------------------------------------------------------------------------------------------
+Angelus_02_ROSWP_4-3_1440x1080.jpg  | Forum User "Angelus"
(jedi.knight(a)wanadoo.es)  | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543
+clouds.jpg                          | Andreas Bjerkeholt (harteex(a)gmail.com)         |
http://www.reactos.org/forum/viewtopic.php?p=17732#p17732
+lake.jpg                            | Andreas Bjerkeholt (harteex(a)gmail.com)         |
http://www.reactos.org/forum/viewtopic.php?p=17732#p17732

Propchange: branches/ReactOS-0.3.15/modules/wallpaper/ReadMe.txt
------------------------------------------------------------------------------
    svn:eol-style = native