diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
commit | e169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch) | |
tree | ae9e92c7e885791c7f47645184070cbcd441ab94 /COPYING | |
parent | c82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff) | |
parent | 91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff) | |
download | fluxbox_lack-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip fluxbox_lack-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2 |
Merge branch 'master' into to_push
Diffstat (limited to 'COPYING')
-rw-r--r-- | COPYING | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | Copyright (c) 2001-2007 Henrik Kinnunen (fluxgen@fluxbox.org) | 1 | Copyright (c) 2001-2008 Henrik Kinnunen (fluxgen@fluxbox.org) |
2 | 2 | ||
3 | Permission is hereby granted, free of charge, to any person obtaining a | 3 | Permission is hereby granted, free of charge, to any person obtaining a |
4 | copy of this software and associated documentation files (the "Software"), | 4 | copy of this software and associated documentation files (the "Software"), |