diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-02 15:14:29 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-02 15:14:31 +0000 |
| commit | 9fee6d735ec674faab98379511257669f93b9ae7 (patch) | |
| tree | 46f053ce582ae6592206fdec79829ae1abd4ec90 /.gitignore | |
| parent | 3a380137c0f342585b9259b5d005c89d89a2e8b5 (diff) | |
| parent | 4fa3a89d3255649169f55e3bb55b05b9ef4029a1 (diff) | |
Merge branch 'serverdata-33277' into dbus-1.4
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions