[ros-diffs] [amunger] 22134: Merge 22121 and 22122 from trunk.

Author: amunger
Date: Thu Jun  1 00:47:07 2006
New Revision: 22134

URL: http://svn.reactos.ru/svn/reactos?rev=22134&view=rev
Log:
Merge 22121 and 22122 from trunk.

Added:
    branches/ros-branch-0_3_0/reactos/base/applications/screenshot/
      - copied from r22122, trunk/reactos/base/applications/screenshot/
Modified:
    branches/ros-branch-0_3_0/reactos/base/applications/applications.rbuild
    branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff

Modified: branches/ros-branch-0_3_0/reactos/base/applications/applications.rbuild
URL:
http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/base/ap…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/base/applications/applications.rbuild (original)
+++ branches/ros-branch-0_3_0/reactos/base/applications/applications.rbuild Thu Jun  1
00:47:07 2006
@@ -46,11 +46,17 @@
 <directory name="screensavers">
 	<xi:include href="screensavers/screensavers.rbuild" />
 </directory>
+<directory name="screenshot">
+	<xi:include href="screenshot/screenshot.rbuild" />
+</directory>
 <directory name="servman">
 	<xi:include href="servman/servman.rbuild" />
 </directory>
 <directory name="shutdown">
 	<xi:include href="shutdown/shutdown.rbuild" />
+</directory>
+<directory name="sndvol32">
+	<xi:include href="sndvol32/sndvol32.rbuild" />
 </directory>
 <directory name="taskmgr">
 	<xi:include href="taskmgr/taskmgr.rbuild" />

Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/bo…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff (original)
+++ branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff Thu Jun  1
00:47:07 2006
@@ -56,6 +56,7 @@
 base\applications\regedit\clb\clb.dll               1
 ;base\applications\reporterror\reporterror.exe      1
 base\applications\sc\sc.exe                         1
+base\applications\screenshot\screenshot.exe         1
 base\applications\servman\servman.exe               1
 base\applications\shutdown\shutdown.exe             1
 ;base\applications\sm\sm.exe                        1