[Fawkes Git] branch/bschaepers/doc: libconfig: minor doc fix

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Wed Dec 21 16:13:42 CET 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, bschaepers/doc has been updated
  discards  7cb59a4e2b5eba21c8dd8cbf33fb48900906fd19 (commit)
        to  4de7cf7155a311aab7ad73b575422a23a029926a (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (7cb59a4e2b5eba21c8dd8cbf33fb48900906fd19)
            \
             N -- N -- N (4de7cf7155a311aab7ad73b575422a23a029926a)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

http://git.fawkesrobotics.org/fawkes.git/bschaepers/doc

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 4de7cf7155a311aab7ad73b575422a23a029926a
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Thu Feb 25 13:01:09 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:13:26 2016 +0100

    libconfig: minor doc fix

http://git.fawkesrobotics.org/fawkes.git/commit/4de7cf7
http://trac.fawkesrobotics.org/changeset/4de7cf7

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


- *Summary* -----------------------------------------------------------


- *Diffs* -------------------------------------------------------------

- *commit* 4de7cf7155a311aab7ad73b575422a23a029926a - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Thu Feb 25 13:01:09 2016 +0100
Subject: libconfig: minor doc fix

 src/libs/config/config.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/config/config.cpp b/src/libs/config/config.cpp
index f22882d..bd17ad2 100644
--- a/src/libs/config/config.cpp
+++ b/src/libs/config/config.cpp
@@ -48,10 +48,10 @@ namespace fawkes {
  * 
  *
  * @fn void Configuration::copy(Configuration *copyconf)
- * Copy all values from the given configuration.
+ * Copies all values from the given configuration.
  * All values from the given configuration are copied. Old values are not erased
  * so that the copied values will overwrite existing values, new values are
- * created, but values existent in current config but not in the copie config
+ * created, but values existent in current config but not in the copied config
  * will remain unchanged.
  * @param copyconf configuration to copy
  * 




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list