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/utils.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/utils.h')
-rw-r--r-- | client/utils.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/utils.h b/client/utils.h index 3b3cbb0b..8f320085 100644 --- a/client/utils.h +++ b/client/utils.h @@ -148,4 +148,3 @@ class EmptyBase { }; #endif - |