Changeset b7a74a8


Ignore:
Timestamp:
Feb 18, 2013, 2:58:37 AM (8 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Parents:
6a20996 (diff), bbe7d4a (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 bbe7d4a8ffa8c6c6b49ff192f54df4c385dfc1cb into 6a209963395d62d98c3d6b52daa6fb2e3054ae1b
File:
1 edited

Legend:

Unmodified
Added
Removed
  • zephyr.c

    r9b3167b rbbe7d4a  
    291291  struct stat statbuff;
    292292
    293   subs = g_new(ZSubscription_t, subSize);
    294293  subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
    295294
     
    307306  if (!file)
    308307    return -1;
     308
     309  subs = g_new(ZSubscription_t, subSize);
    309310  while (owl_getline(&buffer, file)) {
    310311    if (buffer[0] == '#' || buffer[0] == '\n')
Note: See TracChangeset for help on using the changeset viewer.