diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-31 10:42:51 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-31 10:42:51 +0100 |
commit | f563a5d7a820424756f358e747238f03e866838a (patch) | |
tree | f78fa474b1933bd395af401a6d745150f4ecd15e /block/Makefile.objs | |
parent | a27365265cc2fed1178bf25a205e8ee02a9c0caf (diff) | |
parent | aee0bf7d8d7564f8f2c40e4501695c492b7dd8d1 (diff) |
Merge remote-tracking branch 'origin/master' into threadpool
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block/Makefile.objs')
-rw-r--r-- | block/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/Makefile.objs b/block/Makefile.objs index 30ef6aec03..7f015105b1 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -17,3 +17,4 @@ endif common-obj-y += stream.o common-obj-y += commit.o +common-obj-y += mirror.o |