Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-11-13 14:01:10 +00:00
commit 45a10dde95
2 changed files with 3 additions and 2 deletions

View File

@ -49,7 +49,8 @@ void format_cb_host_short(struct format_tree *, struct format_entry *);
void format_cb_pid(struct format_tree *, struct format_entry *);
void format_cb_session_alerts(struct format_tree *, struct format_entry *);
void format_cb_window_layout(struct format_tree *, struct format_entry *);
void format_cb_window_visible_layout(struct format_tree *, struct format_entry *);
void format_cb_window_visible_layout(struct format_tree *,
struct format_entry *);
void format_cb_start_command(struct format_tree *, struct format_entry *);
void format_cb_current_command(struct format_tree *, struct format_entry *);
void format_cb_current_path(struct format_tree *, struct format_entry *);

View File

@ -30,7 +30,7 @@
#define grid_view_x(gd, x) (x)
#define grid_view_y(gd, y) ((gd)->hsize + (y))
/* Get cel. */
/* Get cell. */
void
grid_view_get_cell(struct grid *gd, u_int px, u_int py, struct grid_cell *gc)
{