lp://staging/~smspillaz/compiz-core/compiz-core.merge_894639
Created by
Sam Spilsbury
and last modified
- Get this branch:
- bzr branch lp://staging/~smspillaz/compiz-core/compiz-core.merge_894639
Only
Sam Spilsbury
can upload to this branch. If you are
Sam Spilsbury
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Rejected
for merging
into
lp://staging/compiz-core/0.9.5
- Robert Carr: Pending requested
-
Diff: 1517 lines (+1009/-89)23 files modifiedCMakeLists.txt (+1/-0)
include/core/screen.h (+1/-0)
src/eventsource.cpp (+16/-17)
src/main.cpp (+43/-12)
src/privateeventsource.h (+15/-6)
src/privateiosource.h (+19/-10)
src/privatescreen.h (+9/-3)
src/screen.cpp (+148/-25)
src/timer/src/privatetimeoutsource.h (+4/-3)
src/timer/src/timer.cpp (+8/-7)
src/timer/tests/test-timer.cpp (+4/-4)
src/timer/tests/test-timer.h (+2/-2)
tests/CMakeLists.txt (+1/-0)
tests/integration/CMakeLists.txt (+1/-0)
tests/integration/xig/CMakeLists.txt (+32/-0)
tests/integration/xig/scripts/existing-window.conf (+27/-0)
tests/integration/xig/scripts/new-window.conf (+29/-0)
tests/integration/xig/scripts/restart.conf (+18/-0)
tests/integration/xig/scripts/startup.conf (+14/-0)
tests/integration/xig/scripts/xserver-quit.conf (+13/-0)
tests/integration/xig/src/CMakeLists.txt (+12/-0)
tests/integration/xig/src/config.h.in (+3/-0)
tests/integration/xig/src/test-runner.c (+589/-0)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/compiz-core/0.9.5