diff options
| author | Adam Domurad <[email protected]> | 2012-05-24 09:12:38 -0400 |
|---|---|---|
| committer | Adam Domurad <[email protected]> | 2012-05-24 09:12:38 -0400 |
| commit | d0b1b7896344fb56daa4367594d0966022577c5c (patch) | |
| tree | 8efa470f0de5bcac71476dba1a0da22fae2670cc /plugin/icedteanp | |
| parent | d32710e010c511005c2b49d601faa82b8932d242 (diff) | |
| parent | 3de3c0092244a5b38d09a58c0bd9bb0d90de6f05 (diff) | |
fixing conflict in ChangeLog
Diffstat (limited to 'plugin/icedteanp')
| -rw-r--r-- | plugin/icedteanp/IcedTeaPluginUtils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/icedteanp/IcedTeaPluginUtils.cc b/plugin/icedteanp/IcedTeaPluginUtils.cc index ca538f2..8d9ebe3 100644 --- a/plugin/icedteanp/IcedTeaPluginUtils.cc +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc @@ -289,7 +289,7 @@ IcedTeaPluginUtilities::freeStringPtrVector(std::vector<std::string*>* v) * * @param str The string to split * @param The delimiters to split on - * @return A string vector containing the aplit components + * @return A string vector containing the split components */ std::vector<std::string*>* @@ -1068,7 +1068,7 @@ MessageBus::MessageBus() if(ret) PLUGIN_DEBUG("Error: Unable to initialize message queue mutex: %d\n", ret); - PLUGIN_DEBUG("Mutexs %p and %p initialized\n", &subscriber_mutex, &msg_queue_mutex); + PLUGIN_DEBUG("Mutexes %p and %p initialized\n", &subscriber_mutex, &msg_queue_mutex); } /** |