[Pkg-owncloud-commits] [php-sabre-vobject] 19/43: Merge branch '2.1' into 3.3

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit c7542c4a4ca7b67e6d15d002d8d5e390111cbb5c
Merge: 1c253c2 0217497
Author: Evert Pot <me at evertpot.com>
Date:   Fri Jan 2 18:39:57 2015 -0500

    Merge branch '2.1' into 3.3
    
    Conflicts:
    	lib/Node.php
    	lib/Recur/RRuleIterator.php
    	lib/Sabre/VObject/Component.php
    	lib/Sabre/VObject/Component/VCalendar.php
    	lib/Sabre/VObject/Component/VCard.php
    	lib/Sabre/VObject/Component/VJournal.php
    	lib/Sabre/VObject/Component/VTodo.php
    	lib/Sabre/VObject/DateTimeParser.php
    	lib/Sabre/VObject/Document.php
    	lib/Sabre/VObject/Parameter.php
    	lib/Sabre/VObject/Property.php
    	lib/Sabre/VObject/Property/Compound.php
    	lib/Sabre/VObject/Property/DateTime.php
    	lib/Sabre/VObject/Property/MultiDateTime.php
    	lib/Sabre/VObject/Reader.php
    	lib/Sabre/VObject/TimeZoneUtil.php
    	lib/Sabre/VObject/includes.php

 LICENSE                            | 2 +-
 lib/Component/VAlarm.php           | 2 +-
 lib/Component/VEvent.php           | 2 +-
 lib/Component/VFreeBusy.php        | 2 +-
 lib/ElementList.php                | 2 +-
 lib/FreeBusyGenerator.php          | 2 +-
 lib/Node.php                       | 2 +-
 lib/ParseException.php             | 2 +-
 lib/Recur/RRuleIterator.php        | 2 +-
 lib/Splitter/ICalendar.php         | 2 +-
 lib/Splitter/SplitterInterface.php | 2 +-
 lib/Splitter/VCard.php             | 2 +-
 lib/StringUtil.php                 | 2 +-
 lib/Version.php                    | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --cc lib/Node.php
index 29bae61,6ff18c4..c047d54
--- a/lib/Node.php
+++ b/lib/Node.php
@@@ -3,9 -3,9 +3,9 @@@
  namespace Sabre\VObject;
  
  /**
 - * Base class for all nodes
 + * A node is the root class for every element in an iCalendar of vCard object.
   *
-  * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+  * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
   * @author Evert Pot (http://evertpot.com/)
   * @license http://sabre.io/license/ Modified BSD License
   */
diff --cc lib/Recur/RRuleIterator.php
index 08f2010,a81db23..0a8f9bc
--- a/lib/Recur/RRuleIterator.php
+++ b/lib/Recur/RRuleIterator.php
@@@ -1,24 -1,47 +1,24 @@@
  <?php
  
 -namespace Sabre\VObject;
 +namespace Sabre\VObject\Recur;
 +
 +use DateTime;
 +use InvalidArgumentException;
 +use Iterator;
 +use Sabre\VObject\DateTimeParser;
 +use Sabre\VObject\Property;
 +
  
  /**
 - * This class is used to determine new for a recurring event, when the next
 - * events occur.
 - *
 - * This iterator may loop infinitely in the future, therefore it is important
 - * that if you use this class, you set hard limits for the amount of iterations
 - * you want to handle.
 + * RRuleParser
   *
 - * Note that currently there is not full support for the entire iCalendar
 - * specification, as it's very complex and contains a lot of permutations
 - * that's not yet used very often in software.
 + * This class receives an RRULE string, and allows you to iterate to get a list
 + * of dates in that recurrence.
   *
 - * For the focus has been on features as they actually appear in Calendaring
 - * software, but this may well get expanded as needed / on demand
 - *
 - * The following RRULE properties are supported
 - *   * UNTIL
 - *   * INTERVAL
 - *   * COUNT
 - *   * FREQ=DAILY
 - *     * BYDAY
 - *     * BYHOUR
 - *   * FREQ=WEEKLY
 - *     * BYDAY
 - *     * BYHOUR
 - *     * WKST
 - *   * FREQ=MONTHLY
 - *     * BYMONTHDAY
 - *     * BYDAY
 - *     * BYSETPOS
 - *   * FREQ=YEARLY
 - *     * BYMONTH
 - *     * BYMONTHDAY (only if BYMONTH is also set)
 - *     * BYDAY (only if BYMONTH is also set)
 - *
 - * Anything beyond this is 'undefined', which means that it may get ignored, or
 - * you may get unexpected results. The effect is that in some applications the
 - * specified recurrence may look incorrect, or is missing.
 + * For instance, passing: FREQ=DAILY;LIMIT=5 will cause the iterator to contain
 + * 5 items, one for each day.
   *
-  * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+  * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
   * @author Evert Pot (http://evertpot.com/)
   * @license http://sabre.io/license/ Modified BSD License
   */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git