diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-01-18 11:19:15 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2012-01-18 11:19:15 +0100 |
| commit | c05523462f2c63bfedf183d9fee6debbce6b6ac0 (patch) | |
| tree | adf8e28e1988c1cec514841234c31840c07abf4e /client/x11/.gitignore | |
| parent | 35d35634a947d9aa050fcdcddeb14727b2614b3b (diff) | |
| parent | b5060ff81392ffdbbb6b516dc294f2bea75b4246 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.10
Diffstat (limited to 'client/x11/.gitignore')
| -rw-r--r-- | client/x11/.gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/x11/.gitignore b/client/x11/.gitignore index fbe61107..397a68f4 100644 --- a/client/x11/.gitignore +++ b/client/x11/.gitignore @@ -7,4 +7,4 @@ Makefile Makefile.in setup -spicec
\ No newline at end of file +spicec |