Changeset f1a71c8 for zephyr.c

Timestamp:

Aug 28, 2013, 6:36:07 PM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

ca1fb26a (diff), 441fd42 (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 441fd42c37f0c4bde4b84cd57720625d4787ab73 into ca1fb26a9a22aea6ecd68b0150859ef065c6afc5

File:

• zephyr.c (modified) (3 diffs)

zephyr.c

@@ -152 +152 @@
   ret_sd = owl_zephyr_loaddefaultsubs();
 
-  /* load Barnowl default subscriptions */
+  /* load BarnOwl default subscriptions */
   ret_bd = owl_zephyr_loadbarnowldefaultsubs();
 
@@ -354 +354 @@
 }
 
-/* Load default Barnowl subscriptions
+/* Load default BarnOwl subscriptions
  *
  * Returns 0 on success.
@@ -363 +363 @@
 #ifdef HAVE_LIBZEPHYR
   ZSubscription_t *subs;
-  int subSize = 10; /* Max Barnowl default subs we allow */
+  int subSize = 10; /* Max BarnOwl default subs we allow */
   int count, ret;