merge

2012-02-13 01:01:41 +01:00
parent cee6ccc6ee b11e22df7d
commit 6de1ba6e74
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@@ -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>

 Redistribution and use in source and binary forms, with or without
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # st version
-VERSION = 0.1.1
+VERSION = 0.2-tip

 # Customize below to fit your system

--- a/st.c
+++ b/st.c
@@ -34,7 +34,7 @@
 #endif

 #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"

 /* XEMBED messages */