diff options
| author | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2011-08-08 12:25:18 -0700 |
|---|---|---|
| committer | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2011-08-15 12:42:21 -0700 |
| commit | 6ba04943004025d61e8744cfe87682fcf5d6f9d2 (patch) | |
| tree | 0369867a938365b5e3d14d60fe02f31576473704 | |
| parent | 671fb0e913b4a5e109933036f074f34f6a04528e (diff) | |
Added API documentation to AccountsModel
| -rw-r--r-- | TelepathyQt4Yell/Models/accounts-model.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/TelepathyQt4Yell/Models/accounts-model.cpp b/TelepathyQt4Yell/Models/accounts-model.cpp index 0021021..618b097 100644 --- a/TelepathyQt4Yell/Models/accounts-model.cpp +++ b/TelepathyQt4Yell/Models/accounts-model.cpp @@ -58,7 +58,11 @@ TreeNode *AccountsModel::Private::node(const QModelIndex &index) const /** * \class AccountsModel * \ingroup models +<<<<<<< HEAD * \headerfile TelepathyQt4Yell/accounts-model.h <TelepathyQt4Yell/AccountsModel> +======= + * \headerfile TelepathyQt4Yell/accounst-model.h <TelepathyQt4Yell/AccountsModel> +>>>>>>> Added API documentation to AccountsModel * * \brief The accounts model represents a tree of the valid accounts and their contacts * |