===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/environ.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tmux/environ.c	2012/07/10 11:53:01	1.5
--- src/usr.bin/tmux/environ.c	2014/04/17 14:45:49	1.6
***************
*** 1,4 ****
! /* $OpenBSD: environ.c,v 1.5 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: environ.c,v 1.6 2014/04/17 14:45:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 137,143 ****
   * environment.
   */
  void
! environ_update(const char *vars, struct environ *srcenv, struct environ *dstenv)
  {
  	struct environ_entry	*envent;
  	char			*copyvars, *var, *next;
--- 137,144 ----
   * environment.
   */
  void
! environ_update(const char *vars, struct environ *srcenv,
!     struct environ *dstenv)
  {
  	struct environ_entry	*envent;
  	char			*copyvars, *var, *next;