fixing conflict in ChangeLog

2 files changed, 14 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index c9e6f76..2ef10bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,42 +1,6 @@
-2012-05-23  Deepak Bhole <[email protected]>
-
-	* AUTHORS: Added Martin Olsson to list.
-
-2012-05-23  Martin Olsson  <[email protected]>
-
-	* plugin/icedteanp/IcedTeaNPPlugin.cc:
-	Use g_mutex_free instead of g_free to free appletviewer_mutex (fixes
-	crash).
-
-2012-05-23  Deepak Bhole <[email protected]>
-
-	* ChangeLog: Converted spaces to tabs in an older entry
-
-2012-05-23  Jiri Vanek  <[email protected]>
-
-	* netx/net/sourceforge/jnlp/resources/Messages.properties: fixed error
-	in PBadNonrelativeUrl 
-
-2012-05-23 Jiri Vanek  <[email protected]>
-
-	Added more debugging outputs
-	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
-	(getCodeSourceSecurity): added output message when no SecurityDesc is found
-	for some url/resource
-	* netx/net/sourceforge/jnlp/resources/Messages.properties: added LNoSecInstance
-	and LCertFoundIn values
-	* netx/net/sourceforge/jnlp/security/KeyStores.java: (getPathToKeystore):
-	new method, able to search for file used for creating of KeyStore if possible
-	* netx/net/sourceforge/jnlp/security/CertificateUtils.java: (inKeyStores)
-	using getPathToKeystore for debug output
-
-2012-05-23  Jiri Vanek  <[email protected]>
-
-	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getPermissions):
-	Any exception from this method is consumed somewhere. I have cough exception,
-	reprint it in debug mode and re-throw (to be lost). Main condition in this
-	method had several possible NullPointer exceptions. Separated and thrown before
-	this condition.
+2012-05-24  Martin Olsson <[email protected]>
+	* plugin/icedteanp/IcedTeaPluginUtils.cc:
+	Fix two typos.
 
 2012-05-23  Jiri Vanek  <[email protected]>
 
@@ -58,15 +22,15 @@
 
 2012-05-22  Adam Domurad  <[email protected]>
 
-	Changed allocation of small, fixed-size buffers to stack-based
-	allocations. Changed occurences of sprintf to the safer function
-	snprintf, added buffer information. While unlikely to change
-	functionality, snprintf adds an extra check to prevent buffer
-	overflows.
-	* plugin/icedteanp/IcedTeaNPPlugin.cc: Allocation of small buffers
-	using malloc changed to stack allocation & changed sprintf calls to
-	buffer-size aware snprintf calls.
-	* plugin/icedteanp/IcedTeaPluginUtils.cc: Same as above.
+        Changed allocation of small, fixed-size buffers to stack-based 
+        allocations. Changed occurences of sprintf to the safer function
+        snprintf, added buffer information. While unlikely to change
+        functionality, snprintf adds an extra check to prevent buffer
+        overflows.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc: Allocation of small buffers 
+        using malloc changed to stack allocation & changed sprintf calls to 
+        buffer-size aware snprintf calls. 
+        * plugin/icedteanp/IcedTeaPluginUtils.cc: Same as above.
 
 2012-05-22  Jiri Vanek  <[email protected]>
 
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);
 }
 
 /**