===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/tmux/tmux.c	2009/06/23 18:27:40	1.9
+++ src/usr.bin/tmux/tmux.c	2009/06/25 06:40:25	1.10
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.9 2009/06/23 18:27:40 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.10 2009/06/25 06:40:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -233,19 +233,11 @@
 			cfg_file = xstrdup(optarg);
 			break;
 		case 'L':
-			if (path != NULL) {
-				log_warnx("-L and -S cannot be used together");
-				exit(1);
-			}
 			if (label != NULL)
 				xfree(label);
 			label = xstrdup(optarg);
 			break;
 		case 'S':
-			if (label != NULL) {
-				log_warnx("-L and -S cannot be used together");
-				exit(1);
-			}
 			if (path != NULL)
 				xfree(path);
 			path = xstrdup(optarg);