[akhaldi] 70397: [0.4.0] * Merge rapps fixes by Thomas Faber in revisions 70339 and 70340.

Author: akhaldi
Date: Fri Dec 18 15:19:56 2015
New Revision: 70397

URL: http://svn.reactos.org/svn/reactos?rev=70397&view=rev
Log:
[0.4.0] * Merge rapps fixes by Thomas Faber in revisions 70339 and 70340.

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/media/rapps/putty.txt
    branches/ros-branch-0_4_0/reactos/media/rapps/utorrent.txt

Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Fri Dec 18 15:19:56 2015
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388
+/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388

Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Fri Dec 18 15:19:56 2015
@@ -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,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388
+/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388

Modified: branches/ros-branch-0_4_0/reactos/media/rapps/putty.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/r...
==============================================================================
--- branches/ros-branch-0_4_0/reactos/media/rapps/putty.txt	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/media/rapps/putty.txt	[iso-8859-1] Fri Dec 18 15:19:56 2015
@@ -10,7 +10,7 @@
 Size = 1.84 MB
 Category = 5
 URLSite = http://www.chiark.greenend.org.uk/~sgtatham/putty/
-URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.65-installer.exe
+URLDownload = http://the.earth.li/~sgtatham/putty/0.65/x86/putty-0.65-installer.exe
 SHA1 = 119261bd53b792e13e7fd27384e86ea960597a7e
 CDPath = none

Modified: branches/ros-branch-0_4_0/reactos/media/rapps/utorrent.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/r...
==============================================================================
--- branches/ros-branch-0_4_0/reactos/media/rapps/utorrent.txt	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/media/rapps/utorrent.txt	[iso-8859-1] Fri Dec 18 15:19:56 2015
@@ -4,14 +4,13 @@

[Section]
 Name = µTorrent
-Version = 3.4.3
+Version = 3.4.5
 License = Freeware for non-commercial uses
 Description = Small and fast BitTorrent Client.
-Size = 1.66 MB
+Size = 1.93 MB
 Category = 5
 URLSite = http://www.utorrent.com/
 URLDownload = http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/u...
-SHA1 = 8fffab0df9bf581c209337fc07ea93d2ba22cc8c
 CDPath = none

[Section.0407]