diff options
| author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
|---|---|---|
| committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
| commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
| tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/MultLayers.hh | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-testing/argb.zip fluxbox_lack-testing/argb.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/MultLayers.hh')
| -rw-r--r-- | src/FbTk/MultLayers.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh index 2e3915d..2a979be 100644 --- a/src/FbTk/MultLayers.hh +++ b/src/FbTk/MultLayers.hh | |||
| @@ -67,5 +67,5 @@ private: | |||
| 67 | int m_lock; | 67 | int m_lock; |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | }; | 70 | } |
| 71 | #endif // FBTK_MULTLAYERS_HH | 71 | #endif // FBTK_MULTLAYERS_HH |