added Gottox to Copyright holders after all his contributions, applied his last patch

diff --git a/LICENSE b/LICENSE
index 1b32b82..3fbaaf1 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,11 +1,12 @@
 MIT/X Consortium License
 
 MIT/X Consortium License
 

-© 2006-2008 Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2008 Anselm R Garbe <garbeam at gmail dot com>

 © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
 © 2007 Premysl Hruby <dfenze at gmail dot com>
 © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
 © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
 © 2007 Premysl Hruby <dfenze at gmail dot com>
 © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>

-© 2007 Christof Musik
+© 2007 Christof Musik <christof at sendfax dot de>
+© 2008 Enno Gottox Boland <gottox at gmail dot com>

 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

diff --git a/dwm.c b/dwm.c
index 7684646..8e7a86a 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -118,7 +118,6 @@ typedef struct {
 } Regs;
 
 struct Monitor {
 } Regs;
 
 struct Monitor {

-       unsigned int id;

        int sx, sy, sw, sh, wax, way, wah, waw;
        double mwfact;
        Bool *seltags;
        int sx, sy, sw, sh, wax, way, wah, waw;
        double mwfact;
        Bool *seltags;


@@ -1603,7 +1602,6 @@ setup(void) {
        for(i = 0; i < mcount; i++) {
                /* init geometry */
                m = &monitors[i];
        for(i = 0; i < mcount; i++) {
                /* init geometry */
                m = &monitors[i];

-               m->id = i;

 
                if(mcount != 1 && isxinerama) {
                        m->sx = info[i].x_org;
 
                if(mcount != 1 && isxinerama) {
                        m->sx = info[i].x_org;


@@ -2064,8 +2062,7 @@ selectmonitor(const char *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

-               eprint("dwm-"VERSION", © 2006-2008 Anselm R. Garbe, Sander van Dijk, "
-                      "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
+               eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");

        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");