Fixed merge errors.
authorArmin Novak <armin.novak@thincast.com>
Mon, 27 Oct 2014 10:39:02 +0000 (11:39 +0100)
committerArmin Novak <armin.novak@thincast.com>
Mon, 27 Oct 2014 10:39:02 +0000 (11:39 +0100)
commit8f98f28ce8d9f905937ede54a280ddad79a8aa13
treea60369e72d36d4df08d2e88b89a75db1f77b3253
parenta6eff65259f6e1b7554bc88079019ad0fdac461b
Fixed merge errors.
winpr/libwinpr/synch/wait.c
winpr/libwinpr/thread/thread.c