Changeset 220db88


Ignore:
Timestamp:
Jul 11, 2011, 10:33:11 AM (10 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
a130fc5 (diff), 16cf182d (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 16cf182d1bda3c32ab0cf40b5848f9b365f22a97 into a130fc5ed65377322966cc9423b3e4674197922c
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • global.c

    r2560529 r16cf182d  
    5353  g->resizepending=0;
    5454  g->direction=OWL_DIRECTION_DOWNWARDS;
    55   g->zaway=0;
    5655  owl_fmtext_init_colorpair_mgr(&(g->cpmgr));
    5756  g->debug=OWL_DEBUG;
  • help.c

    ra16d7e5 r820e852  
    6666     "\n"
    6767     "    l             Print a zephyr/AIM buddy listing\n"
    68      "    A             Toggle zaway\n"
     68     "    A             Toggle away\n"
    6969     "    o             Toggle one-line display mode\n"
    7070     "    w             Open a URL in the current message\n"
  • owl.h

    r2560529 r16cf182d  
    556556  char *startupfile;
    557557  int direction;
    558   int zaway;
    559   char *cur_zaway_msg;
    560558  int haveconfig;
    561559  int config_format;
Note: See TracChangeset for help on using the changeset viewer.