Merge branch 'fix-kidletime-cmake' into fix-kidletime-awaymanager-bug
authorxdarklight <darklight.xdarklight@googlemail.com>
Sun, 25 Apr 2010 20:14:59 +0000 (22:14 +0200)
committerxdarklight <darklight.xdarklight@googlemail.com>
Sun, 25 Apr 2010 20:14:59 +0000 (22:14 +0200)
commit75161535784c06c84187b552d59c18181cefff06
tree856bde09fdee051b2bdc8e5216bc94c700fda5f5
parent9e7bba8fa7c99365ee27d79bf75689ed7572f3b3
parent97e73e98622644ff9468d2e0e9155840f464122d
Merge branch 'fix-kidletime-cmake' into fix-kidletime-awaymanager-bug