~checkbox-dev/checkbox/trunk

Viewing all changes in revision 2718.

  • Committer: Daniel Manrique
  • Author(s): Po-Hsu Lin
  • Date: 2014-02-26 10:36:18 UTC
  • mfrom: (2717.1.1 compiz-parser-fix)
  • Revision ID: daniel_manrique-20140226103618-3anhkjq8rotxor9z
"automatic merge by tarmac [r=zkrynicki][bug=1285038][author=cypressyew]"

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: