Microsoft Windows XP [Version 5.1.2600]
(C) Copyright 1985-2001 Microsoft Corp.

H:\>cd public_html

H:\public_html>cd npd_release

H:\public_html\npd_release>svn merge -c -2199 .

H:\public_html\npd_release>svn info
Path: .
URL: https://bisdevel.bis.ae-solutions.com/svn/bobcat/projects/trunk
Repository UUID: dc8d1144-02f7-0310-bf1c-944ea9eca671
Revision: 2201
Node Kind: directory
Schedule: normal
Last Changed Author: anelson
Last Changed Rev: 2200
Last Changed Date: 2007-06-21 14:30:16 -0500 (Thu, 21 Jun 2007)


H:\public_html\npd_release>svn status
?      O3P2EO~L
?      IP0QTE~5
M      newProgramRequest.php

H:\public_html\npd_release>svn log --limit 8 -v
------------------------------------------------------------------------
r2200 | anelson | 2007-06-21 14:30:16 -0500 (Thu, 21 Jun 2007) | 1 line
Changed paths:
   M /trunk/include/project.inc.php

NPO server validation added so it works on servers other than the live server wi
thout error or causing an issue with project files.
------------------------------------------------------------------------
r2199 | anelson | 2007-06-21 14:12:34 -0500 (Thu, 21 Jun 2007) | 1 line
Changed paths:
   M /trunk/newProgramRequest.php

Merged released changes to trunk
------------------------------------------------------------------------
r2190 | smccarthy | 2007-04-18 10:00:20 -0500 (Wed, 18 Apr 2007) | 1 line
Changed paths:
   M /trunk/include/financialUpload.pl


------------------------------------------------------------------------
r2187 | anelson | 2007-02-13 11:33:13 -0600 (Tue, 13 Feb 2007) | 2 lines
Changed paths:
   A /trunk/js/program_personnel.js

Missed a file.

------------------------------------------------------------------------
r2186 | anelson | 2007-02-13 11:08:14 -0600 (Tue, 13 Feb 2007) | 2 lines
Changed paths:
   M /trunk/include/programTeamMember.inc.php
   M /trunk/include/projectContact.inc.php
   M /trunk/includes/dbStart.inc.php
   M /trunk/program_personnel.php

Updated the personnel features as per requested. Now they are allowed to remove
personnel from being a functional lead without having to assign it to another.

------------------------------------------------------------------------
r2185 | anelson | 2007-02-12 11:26:33 -0600 (Mon, 12 Feb 2007) | 2 lines
Changed paths:
   M /trunk/include/checklistExport.inc.php

Changes to allow for some debug messages.

------------------------------------------------------------------------
r2184 | anelson | 2007-02-12 10:06:19 -0600 (Mon, 12 Feb 2007) | 2 lines
Changed paths:
   M /trunk/project_contact.php

Added a debug mail line to automatically have a debug mailing if not on the live
 server.

------------------------------------------------------------------------
r2183 | anelson | 2007-02-08 15:44:42 -0600 (Thu, 08 Feb 2007) | 2 lines
Changed paths:
   M /trunk/include/myCustomReports.inc.php
   M /trunk/myReports.php

Fixed an issue where the new functional leads on the myreports wasn't listing re
cords that were missing any functional leads.

------------------------------------------------------------------------

H:\public_html\npd_release>