summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2005-11-16 22:48:35 (GMT)
committersimonb <simonb>2005-11-16 22:48:35 (GMT)
commit93e30412af3d40470fbf077619899b4f77ee6115 (patch)
tree505a0a89ed2e916922d069f74ea59da92c562f75
parent28837ee6e1e3226bec37a7854bd36c45406058f6 (diff)
downloadfluxbox_lack-93e30412af3d40470fbf077619899b4f77ee6115.zip
fluxbox_lack-93e30412af3d40470fbf077619899b4f77ee6115.tar.bz2
changelog had wrong name, default was from old patch
-rw-r--r--ChangeLog4
-rw-r--r--src/fluxbox.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8897a3a..13c3c25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15: 2Changes for 0.9.15:
3*05/11/16: 3*05/11/16:
4 * Added overlayStyle resource to init-file (Mathias) 4 * Added styleOverlay resource to init-file (Mathias)
5 session.overlayStyle : ~/.fluxbox/overlay 5 session.styleOverlay: ~/.fluxbox/overlay
6 Style settings in this file override any settings from a 6 Style settings in this file override any settings from a
7 regular style 7 regular style
8 fluxbox.hh/cc Screen.cc FbCommands.cc FbTk/Theme.hh/cc 8 fluxbox.hh/cc Screen.cc FbCommands.cc FbTk/Theme.hh/cc
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 94020f2..9aff2ed 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -205,7 +205,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
205 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), 205 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"),
206 m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), 206 m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"),
207 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), 207 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"),
208 m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/ovrd_style", "session.styleOverlay", "Session.StyleOverlay"), 208 m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/overlay", "session.styleOverlay", "Session.StyleOverlay"),
209 m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), 209 m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"),
210 m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), 210 m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"),
211 m_rc_slitlistfile(m_resourcemanager, "~/.fluxbox/slitlist", "session.slitlistFile", "Session.SlitlistFile"), 211 m_rc_slitlistfile(m_resourcemanager, "~/.fluxbox/slitlist", "session.slitlistFile", "Session.SlitlistFile"),