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/gui/resource_provider.h | |
| parent | 35d35634a947d9aa050fcdcddeb14727b2614b3b (diff) | |
| parent | b5060ff81392ffdbbb6b516dc294f2bea75b4246 (diff) | |
| download | spice-c05523462f2c63bfedf183d9fee6debbce6b6ac0.tar.gz spice-c05523462f2c63bfedf183d9fee6debbce6b6ac0.tar.xz spice-c05523462f2c63bfedf183d9fee6debbce6b6ac0.zip | |
Merge remote-tracking branch 'origin/master' into 0.10
Diffstat (limited to 'client/gui/resource_provider.h')
| -rw-r--r-- | client/gui/resource_provider.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/gui/resource_provider.h b/client/gui/resource_provider.h index 6f59cb8a..c0d319b5 100644 --- a/client/gui/resource_provider.h +++ b/client/gui/resource_provider.h @@ -57,4 +57,3 @@ enum { const char* res_get_string(int id); #endif - |