summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2009-01-21 09:50:38 +0100
committerDanny Baumann <dannybaumann@web.de>2009-01-21 09:50:38 +0100
commitf33a3b6252c42f11b5252a290d07f90423f1b452 (patch)
tree521a04c53fec91a2145b609e93060fef52bbeba3
parent8b06a039f1585f160e099b8f12da060dd9d7d37d (diff)
parent0cfa4b3b32594f7d5d96b1a4facb27e29b493338 (diff)
downloadautoresize-f33a3b6252c42f11b5252a290d07f90423f1b452.tar.gz
autoresize-f33a3b6252c42f11b5252a290d07f90423f1b452.tar.bz2
Merge branch 'compiz++' of git+ssh://maniac@git.opencompositing.org/git/fusion/plugins/snap into compiz++
Conflicts: snap.cpp
0 files changed, 0 insertions, 0 deletions