[ros-diffs] [akhaldi] 70519: [0.4.0] * Thank you for everything Colin! aka merge r70501.

Author: akhaldi
Date: Thu Jan  7 11:57:13 2016
New Revision: 70519

URL: http://svn.reactos.org/svn/reactos?rev=70519&view=rev
Log:
[0.4.0] * Thank you for everything Colin! aka merge r70501.

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/CREDITS

Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Jan  7 11:57:13 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,70436-70437,70443,70464,70470,70480,70497,70499-70500,70510
+/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,70436-70437,70443,70464,70470,70480,70497,70499-70501,70510

Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Jan  7 11:57:13 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,70436-70437,70443,70464,70470,70480,70497,70510
+/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,70436-70437,70443,70464,70470,70480,70497,70501,70510

Modified: branches/ros-branch-0_4_0/reactos/CREDITS
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/CREDIT…
==============================================================================
--- branches/ros-branch-0_4_0/reactos/CREDITS	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/CREDITS	[iso-8859-1] Thu Jan  7 11:57:13 2016
@@ -13,6 +13,7 @@
 Cameron M. Gutman <cgutman(a)reactos.org>
 Casper S. Hornstrup <chorns(a)users.sourceforge.net>
 Christoph von Wittich <christoph_vw(a)reactos.org>
+Colin Finck <colin(a)reactos.org>
 Daniel Reimer <reimer.daniel(a)freenet.de>
 David Welch <welch(a)cwcom.net>
 Dmitry Chapyshev <dmitry(a)reactos.org>