[ros-diffs] [cfinck] 39309: Merge 39307 and use the wallpaper (2/2)

[cfinck at svn.reactos.org]

Author: cfinck
Date: Tue Feb  3 05:30:36 2009
New Revision: 39309

URL: http://svn.reactos.org/svn/reactos?rev=39309&view=rev
Log:
Merge 39307 and use the wallpaper (2/2)

Added:
    branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp   (props changed)
      - copied unchanged from r39307, trunk/wallpaper/Angelus.02_ROSWP.bmp
    branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg   (props changed)
      - copied unchanged from r39307, trunk/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg
Modified:
    branches/ros-branch-0_3_8/wallpaper/ReadMe.txt
    branches/ros-branch-0_3_8/wallpaper/directory.rbuild

Propchange: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: branches/ros-branch-0_3_8/wallpaper/ReadMe.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/wallpaper/ReadMe.txt?rev=39309&r1=39308&r2=39309&view=diff
==============================================================================
--- branches/ros-branch-0_3_8/wallpaper/ReadMe.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_8/wallpaper/ReadMe.txt [iso-8859-1] Tue Feb  3 05:30:36 2009
@@ -1,10 +1,8 @@
-wallpaper 
+Wallpapers
+===========
 
-posten in ReactOS Forum May 17, 2006 7:31 pm
-cluds.jpg
-Copyright by Andreas Bjerkeholt (harteex at gmail dot com)
-
-lake.jpg 
-Copyright by Andreas Bjerkeholt (harteex at gmail dot com)
-
-
+File Name                           | Author                                         | Origin
+--------------------------------------------------------------------------------------------------------------------------------------------------
+Angelus.02_ROSWP_4-3_1440x1080.jpg  | Forum User "Angelus" (jedi.knight at wanadoo.es)  | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543
+clouds.jpg                          | Andreas Bjerkeholt (harteex at gmail.com)         | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732
+lake.jpg                            | Andreas Bjerkeholt (harteex at gmail.com)         | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732

Modified: branches/ros-branch-0_3_8/wallpaper/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/wallpaper/directory.rbuild?rev=39309&r1=39308&r2=39309&view=diff
==============================================================================
--- branches/ros-branch-0_3_8/wallpaper/directory.rbuild [iso-8859-1] (original)
+++ branches/ros-branch-0_3_8/wallpaper/directory.rbuild [iso-8859-1] Tue Feb  3 05:30:36 2009
@@ -1,3 +1,3 @@
 <group>
-	<installfile>lake.bmp</installfile>
+	<installfile>Angelus.02_ROSWP.bmp</installfile>
 </group>