[Bps-public-commit] r12388 - Prophet/branches/luid

[sartak at bestpractical.com]

Author: sartak
Date: Fri May 16 07:53:46 2008
New Revision: 12388

Modified:
   Prophet/branches/luid/   (props changed)
   Prophet/branches/luid/MANIFEST
   Prophet/branches/luid/MANIFEST.SKIP

Log:
- Merge //mirror/bps-public/Prophet/trunk to //mirror/bps-public/Prophet/branches/luid

Modified: Prophet/branches/luid/MANIFEST
==============================================================================
--- Prophet/branches/luid/MANIFEST	(original)
+++ Prophet/branches/luid/MANIFEST	Fri May 16 07:53:46 2008
@@ -61,6 +61,7 @@
 t/create-conflict.t
 t/create.t
 t/delete-delete-conflict.t
+t/edit.t
 t/export.t
 t/generalized_sync_n_merge.t
 t/lib/TestApp/Bug.pm

Modified: Prophet/branches/luid/MANIFEST.SKIP
==============================================================================
--- Prophet/branches/luid/MANIFEST.SKIP	(original)
+++ Prophet/branches/luid/MANIFEST.SKIP	Fri May 16 07:53:46 2008
@@ -3,3 +3,5 @@
 .sw?$
 .svn$
 .bak$
+^blib/
+pm_to_blib