merge

diff --git a/LICENSE b/LICENSE
index ee32d287e9b4037f52c32f8f1ff397c3a306e902..a8336d70f9ddb47baf7a8acd511ea938f078367a 100644 (file)
--- a/LICENSE
+++ b/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>
 
 Redistribution and use in source and binary forms, with or without

diff --git a/config.mk b/config.mk
index ea5b5ef110fe9b794db923f38bc716eee5298966..5729e59a442bb10c206b833874d3f887f2ed121a 100644 (file)
--- 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
 

diff --git a/st.c b/st.c
index 98cd78ac81ba3f1862960ce8b77bada5d9adeffa..fca97ce883ea853ef6ce05b7a343b6d7fd78aa1a 100644 (file)
--- 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 */