summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2009-11-14 11:29:46 +0800
committerSam Spilsbury <smspillaz@gmail.com>2009-11-14 11:29:46 +0800
commit68491a1ac4b7a5eaab5fc3948092b1d702fa43ef (patch)
tree5ab2ca1a6d971eeac46ba0d325eae8d191a5962b /src
parentb9592cab7fc1632b98f62b3afb8e6cc773ee0d7f (diff)
parent3e17ace76e47a336874ff714a7e67f748fdbf18e (diff)
downloadzcomp-68491a1ac4b7a5eaab5fc3948092b1d702fa43ef.tar.gz
zcomp-68491a1ac4b7a5eaab5fc3948092b1d702fa43ef.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
Diffstat (limited to 'src')
-rw-r--r--src/region.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/region.cpp b/src/region.cpp
index 9cd4e33..44bee8c 100644
--- a/src/region.cpp
+++ b/src/region.cpp
@@ -399,7 +399,7 @@ CompRegion::operator^= (const CompRegion &r)
const CompRegion
CompRegion::operator| (const CompRegion &r) const
{
- united (r);
+ return united (r);
}
CompRegion &