diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 /vcl/unx/kde | |
parent | 98b2c08dff4d00b3e7a2e001c326ebe27dae4549 (diff) |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'vcl/unx/kde')
-rw-r--r-- | vcl/unx/kde/kdedata.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index b3a7c953ffa0..9c4f43fc9db7 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -55,7 +55,7 @@ #include "i18n_im.hxx" #include "i18n_xkb.hxx" #include <vos/process.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> /* #i59042# override KApplications method for session management * since it will interfere badly with our own. |