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 /nls | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-argb.zip fluxbox_lack-argb.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'nls')
| -rw-r--r-- | nls/fluxbox-nls.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh index a304995..7e461ca 100644 --- a/nls/fluxbox-nls.hh +++ b/nls/fluxbox-nls.hh | |||
| @@ -253,6 +253,6 @@ enum { | |||
| 253 | 253 | ||
| 254 | }; // end enum | 254 | }; // end enum |
| 255 | 255 | ||
| 256 | }; // end namespace FBNLS | 256 | } // end namespace FBNLS |
| 257 | 257 | ||
| 258 | #endif // FLUXBOX_NLS_HH | 258 | #endif // FLUXBOX_NLS_HH |