summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ObjectModel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 76ae5080..7efa8a9b 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -73,10 +73,10 @@ ObjectModel::polyphonic() const
return (polyphonic.is_valid() && polyphonic.get<int32_t>());
}
-/** Merge the data of @a model with self, as much as possible.
+/** Merge the data of `o` with self, as much as possible.
*
* This will merge the two models, but with any conflict take the value in
- * @a o as correct. The paths of the two models MUST be equal.
+ * `o` as correct. The paths of the two models MUST be equal.
*/
void
ObjectModel::set(SPtr<ObjectModel> o)