The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: fb507e28f9a7aee3b87eccdbfa0ec96cea7f9533 f1a7a44 This needs to go into Horde_Core 6c80614 Too wordy 4f2fd86 Horde_Queue is mandatory, since Horde_Queue_Storage is a global injector instance 52bbe0f Fix property name 75852de Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit f1a7a446d0b54c3558c9f226b1232ee26ba6da54 Author: Michael M Slusarz <[email protected]> Date: Sun Feb 24 17:40:57 2013 -0700 This needs to go into Horde_Core imp/package.xml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/f1a7a446d0b54c3558c9f226b1232ee26ba6da54 ----------------------------------------------------------------------- commit 6c806148454e74577eca47c7c0b6d78f181b5452 Author: Michael M Slusarz <[email protected]> Date: Sun Feb 24 17:41:25 2013 -0700 Too wordy framework/Imap_Client/package.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/6c806148454e74577eca47c7c0b6d78f181b5452 ----------------------------------------------------------------------- commit 4f2fd86ea854a0a0f55f7bdbfec3c233ea012362 Author: Michael M Slusarz <[email protected]> Date: Sun Feb 24 17:42:14 2013 -0700 Horde_Queue is mandatory, since Horde_Queue_Storage is a global injector instance framework/Core/package.xml | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/4f2fd86ea854a0a0f55f7bdbfec3c233ea012362 ----------------------------------------------------------------------- commit 52bbe0f90c9bd3fb47e45eb18c612a7118cf2783 Author: Michael M Slusarz <[email protected]> Date: Sun Feb 24 22:14:27 2013 -0700 Fix property name imp/search.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/52bbe0f90c9bd3fb47e45eb18c612a7118cf2783 ----------------------------------------------------------------------- commit 75852de8902d8f3b2ad0a19e67867849fa43b8d6 Merge: f1a7a44 52bbe0f Author: Michael M Slusarz <[email protected]> Date: Sun Feb 24 22:15:17 2013 -0700 Merge branch 'master' into imp_6_1 Conflicts: imp/search.php framework/Core/package.xml | 7 +++++++ framework/Imap_Client/package.xml | 4 ++-- imp/lib/Basic/Search.php | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/75852de8902d8f3b2ad0a19e67867849fa43b8d6 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
