Commit 20da8f41 authored by Simon Morlat's avatar Simon Morlat
Browse files

fix bad merge

parent 5db6533a
......@@ -38,11 +38,7 @@ static void center_rectangle(MSVideoSize wsize, MSVideoSize vsize, MSRect *rect)
rect->h=h;
}
<<<<<<< HEAD
=======
#define LOCAL_BORDER_SIZE 2
>>>>>>> ab14e9c78bea0b705f68f9b2e554fa565b4a3ecf
#define LOCAL_POS_OFFSET 10
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment