aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Domurad <[email protected]>2012-05-24 10:31:44 -0400
committerAdam Domurad <[email protected]>2012-05-24 10:31:44 -0400
commitb352a803f1a40654d7b10bfed48f5ef634b35395 (patch)
tree18583416f8265a57e8e505b037d04952af27fa33
parent6cffa7fa888d5a4b4c30158285d09b564661d851 (diff)
Reapplied the patches, sorry for the mess!
-rw-r--r--ChangeLog4
-rw-r--r--plugin/icedteanp/IcedTeaPluginUtils.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 10694fd..988395a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-24 Martin Olsson <[email protected]>
+ * plugin/icedteanp/IcedTeaPluginUtils.cc:
+ Fix two typos.
+
2012-05-23 Deepak Bhole <[email protected]>
* AUTHORS: Added Martin Olsson to list.
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);
}
/**