merge
This commit is contained in:
		
							
								
								
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | |||||||
| Copyright (c) 2009, Aurélien APTEL <aurelien dot aptel at gmail dot com> | Copyright (c) 2009-2012, Aurélien APTEL <aurelien dot aptel at gmail dot com> | ||||||
| Copyright (c) 2009, Anselm R Garbe <garbeam at gmail dot com> | Copyright (c) 2009, Anselm R Garbe <garbeam at gmail dot com> | ||||||
|  |  | ||||||
| Redistribution and use in source and binary forms, with or without | Redistribution and use in source and binary forms, with or without | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| # st version | # st version | ||||||
| VERSION = 0.1.1 | VERSION = 0.2-tip | ||||||
|  |  | ||||||
| # Customize below to fit your system | # Customize below to fit your system | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								st.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								st.c
									
									
									
									
									
								
							| @@ -34,7 +34,7 @@ | |||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #define USAGE \ | #define USAGE \ | ||||||
| 	"st " VERSION " (c) 2010-2011 st engineers\n" \ | 	"st " VERSION " (c) 2010-2012 st engineers\n" \ | ||||||
| 	"usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n" | 	"usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n" | ||||||
|  |  | ||||||
| /* XEMBED messages */ | /* XEMBED messages */ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user