aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2010-09-19 06:49:59 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2010-09-19 06:49:59 (GMT)
commit375c93241dcb8302dd9092ccad9a55a109c6307b (patch)
treee115d39285d14d1abfbb1763bc559f029928c185 /src/fluxbox.cc
parente0c440f5993dbc308fcb14daa634c941a0c45ce0 (diff)
parente3a2c56252914aa98ee7566563dc0b2884f90986 (diff)
downloadfluxbox-375c93241dcb8302dd9092ccad9a55a109c6307b.zip
fluxbox-375c93241dcb8302dd9092ccad9a55a109c6307b.tar.bz2
merged conflicts
Diffstat (limited to 'src/fluxbox.cc')
0 files changed, 0 insertions, 0 deletions