diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/configuration.h | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/configuration.h')
| -rw-r--r-- | src/configuration.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/configuration.h b/src/configuration.h index 44ce688d..a675002b 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -113,9 +113,9 @@ class ConfigurationObject /** * Serialises a container into a list of configuration options * - * \param IT Iterator type over CONT - * \param T Elements that IT iterates over - * \param CONT The associated container type + * \tparam IT Iterator type over CONT + * \tparam T Elements that IT iterates over + * \tparam CONT The associated container type * * \param name Name of the list the elements should be stored under * \param begin Iterator start @@ -151,9 +151,9 @@ class ConfigurationObject /** * Serialises a container into a list of configuration options * - * \param IT Iterator type over CONT - * \param T Elements that IT iterates over - * \param CONT The associated container type + * \tparam IT Iterator type over CONT + * \tparam T Elements that IT iterates over + * \tparam CONT The associated container type * * \param name Name of the list the elements should be read from under * \param empty Initial (empty) container to write to |