← Back to branch summary

~oif-team/grail/saucy

« back to all changes in this revision

Viewing changes to test/integration/x11/timeout.cpp

  • Committer: Daniel d'Andrada
  • Date: 2012-12-06 18:29:01 UTC
  • mfrom: (250 trunk)
  • mto: This revision was merged to the branch mainline in revision 251.
  • Revision ID: daniel.dandrada@canonical.com-20121206182901-ocunhausxxqr1q34
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/integration/x11/timeout.cpp
5
5
 * Copyright (C) 2012 Canonical Ltd.
6
6
 *
7
7
 * This program is free software: you can redistribute it and/or modify it
8
 
 * under the terms of the GNU General Public License as published by the
9
 
 * Free Software Foundation, either version 3 of the License, or (at your
10
 
 * option) any later version.
 
8
 * under the terms of version 3 of the GNU General Public License as published
 
9
 * by the Free Software Foundation.
11
10
 *
12
11
 * This program is distributed in the hope that it will be useful, but
13
12
 * WITHOUT ANY WARRANTY; without even the implied warranty of