summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJim Ramsay <i.am@jimramsay.com>2009-10-14 01:05:49 (GMT)
committerJim Ramsay <i.am@jimramsay.com>2009-10-14 01:05:49 (GMT)
commit839ea523164caecd8c779e60539b78c2a748a81f (patch)
tree0019d04f27a1a258bc7a900e3cf77b916dca6493 /AUTHORS
parent4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff)
parent8def80cec337a986b762cdbb5e2555c6da809353 (diff)
downloadfluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip
fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2
Merge branch 'master' into argbtesting/argbargb
Conflicts: src/FbTk/FbWindow.cc
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 9ac254f..33adc02 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,8 @@ Main developers:
10 Mark Tiefenbruck <mark(at)fluxbox.org> 10 Mark Tiefenbruck <mark(at)fluxbox.org>
11 11
12Contributors: 12Contributors:
13 Jim Ramsay <i.am(at)jimramsay.com>
14 - documentation updates, bugfixes, some code.
13 Han Boetes <han(at)mijncomputer.nl> 15 Han Boetes <han(at)mijncomputer.nl>
14 - RPM Packaging, debugging and scripts. 16 - RPM Packaging, debugging and scripts.
15 - fbsetbg, fluxbox-generate_menu 17 - fbsetbg, fluxbox-generate_menu