Merge branch 'master' of github.com:fikovnik/ShiftIt

Conflicts: ShiftIt/X11WindowDriver.m
fikovnik · Apr 27, 2015 · e6c3906 · e6c3906
2 parents 9807e69 + 7035aa1
commit e6c3906
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ShiftIt/X11WindowDriver.m b/ShiftIt/X11WindowDriver.m
@@ -463,4 +463,4 @@ - (void) freeWindow_:(Window *)windowRef {
 }
 
 
-@end
+@end