Still need another merge with lp:mir it seems: Text conflict in benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp Text conflict in tests/acceptance-tests/CMakeLists.txt
« Back to merge proposal
Still need another merge with lp:mir it seems: frame-uniformit y/vsync_ simulating_ graphics_ platform. cpp e-tests/ CMakeLists. txt
Text conflict in benchmarks/
Text conflict in tests/acceptanc