Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 3 insertions, 3 deletions

diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 18cec3f..e2dcf70 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -93,7 +93,7 @@ FbWindow::FbWindow(int screen_num,
     create(RootWindow(display(), screen_num),
            x, y, width, height, eventmask,
            override_redirect, save_unders, depth, class_type, visual, cmap);
-};
+}
 
 FbWindow::FbWindow(const FbWindow &parent,
                    int x, int y, unsigned int width, unsigned int height,
@@ -122,7 +122,7 @@ FbWindow::FbWindow(const FbWindow &parent,
            override_redirect, save_unders, depth, class_type, visual, cmap);
 
 
-};
+}
 
 FbWindow::FbWindow(Window client):
     FbDrawable(),
@@ -733,4 +733,4 @@ bool operator == (Window win, const FbWindow &fbwin) {
     return win == fbwin.window();
 }
 
-};
+}