]> git.draconx.ca Git - fvwmconf.git/commit
Merge branch 'master' of atropos:.fvwm
authorNick Bowler <draconx@gmail.com>
Sun, 1 Jun 2008 23:42:32 +0000 (19:42 -0400)
committerNick Bowler <draconx@gmail.com>
Sun, 1 Jun 2008 23:42:32 +0000 (19:42 -0400)
commitf0b5b8ca7eb9a95227c5946f5f7dbfce08b8ef73
treef801a6a085f084b7adbe4ef7360c1046a5e0889b
parentde1ccf79fbcf9ba31a011d6e1e12abd9c03990e0
parent95fe4128ce64545a770629a54779de69570cce73
Merge branch 'master' of atropos:.fvwm

Conflicts:

scripts/mpdmenu.pl
scripts/mpdmenu.pl