[sakai] svn commit: r74219 - in kernel/branches/kernel-1.1.x: . api/src/main/java/org/sakaiproject/entity/api kernel-impl/src kernel-impl/src/main/java/org/sakaiproject/content/impl

[david.horwitz at uct.ac.za]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=74219

Author: david.horwitz at uct.ac.za
Date: 2010-03-05 05:15:08 -0500 (Fri, 05 Mar 2010)
New Revision: 74219

Modified:
   kernel/branches/kernel-1.1.x/
   kernel/branches/kernel-1.1.x/api/src/main/java/org/sakaiproject/entity/api/ResourceProperties.java
   kernel/branches/kernel-1.1.x/kernel-impl/src/
   kernel/branches/kernel-1.1.x/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java
Log:
> svn log -r74133 https://source.sakaiproject.org/svn/kernel/trunk
------------------------------------------------------------------------
r74133 | david.horwitz at uct.ac.za | 2010-03-03 11:19:49 +0200 (Wed, 03
Mar 2010) | 2 lines

KNL-200 merged changes from uct msub

------------------------------------------------------------------------
dhorwitz at david-horwitz-4:~/branchManagement/kernel-1.1.x> svn merge
-c74133 https://source.sakaiproject.org/svn/kernel/trunk
--- Merging r74133 into 'kernel-impl/src':
U
kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java
--- Merging r74133 into '.':
U
api/src/main/java/org/sakaiproject/entity/api/ResourceProperties.java
 G   .