[commits] Horde branch master updated. bad7aec171635a8cc47040c01aae1cc625c058a1

[Michael J. Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 76a41c4e2dd0a3343b1f4148871038d3f88b4059

03b9eac Allow displaying resource calendars merged in like other calendars.
bad7aec Show the correct selected state for resource calendars.

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

commit 03b9eac10f0bb323488b51ec6946a079413d614d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 4 17:23:36 2012 -0400

    Allow displaying resource calendars merged in like other calendars.

 kronolith/config/prefs.php    |    4 ++++
 kronolith/lib/Application.php |    4 ++--
 kronolith/lib/Kronolith.php   |   11 ++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/03b9eac10f0bb323488b51ec6946a079413d614d

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

commit bad7aec171635a8cc47040c01aae1cc625c058a1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 4 17:25:18 2012 -0400

    Show the correct selected state for resource calendars.

 kronolith/lib/Application.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/bad7aec171635a8cc47040c01aae1cc625c058a1