diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-08-23 16:56:17 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-08-23 16:56:17 +0200 |
| commit | 2acc011c62089c7ca2b8ad6a9f8cced6a66a5f16 (patch) | |
| tree | 26aa65b9b16c9d02f6178bc131d75c85bf0f34b3 | |
| parent | 0795368709dd73582cec25348a6c2ba6f7be8250 (diff) | |
| download | spice-2acc011c62089c7ca2b8ad6a9f8cced6a66a5f16.tar.gz spice-2acc011c62089c7ca2b8ad6a9f8cced6a66a5f16.tar.xz spice-2acc011c62089c7ca2b8ad6a9f8cced6a66a5f16.zip | |
Fix mismerge in last commit
| -rw-r--r-- | server/red_worker.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index b025cc69..e56e4090 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -3020,7 +3020,6 @@ static inline int red_current_add(RedWorker *worker, Ring *ring, Drawable *drawa red_streams_update_clip(worker, drawable); } else { if (drawable->surface_id == 0) { -#ifdef STREAM_TRACE red_detach_streams_behind(worker, &drawable->tree_item.base.rgn); } } |