Changeset 3fbce97 for protocols/yahoo/libyahoo2.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• protocols/yahoo/libyahoo2.c (modified) (2 diffs)

protocols/yahoo/libyahoo2.c

@@ -12 +12 @@
  * GNU GPL.
  *
- * This code is derivitive of Gaim <http://gaim.sourceforge.net>
+ * This code is derivative of Gaim <http://gaim.sourceforge.net>
  * copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
  *             1998-1999, Adam Fritzler <afritz@marko.net>
@@ -1402 +1402 @@
 
         /*
-         * Status updates may be spread accross multiple packets and not
+         * Status updates may be spread across multiple packets and not
          * even on buddy boundaries, so keeping some state is important.
          * So, continue where we left off, and only add a user entry to