diff options
| author | falkTX <falktx@gmail.com> | 2014-04-15 15:13:13 +0000 |
|---|---|---|
| committer | falkTX <falktx@gmail.com> | 2014-04-15 15:13:13 +0000 |
| commit | 6825d91453b9fa4a5fb5f8dd8c504005b89bf750 (patch) | |
| tree | 68563ad3e08c6dc5590d82b4276598bbcd436add /libs | |
| parent | 7eae1d55213b20c8e159f434c61137d6b4bbbdd5 (diff) | |
| parent | 6841888a0b3b1415838ff0360d2a9e64892c652e (diff) | |
Merge branch 'master' of github.com:zamaudio/zam-plugins-DPF
Conflicts:
libs/dgl/src/pugl/pugl_x11.c
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/dgl/src/Window.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/dgl/src/Window.cpp b/libs/dgl/src/Window.cpp index f0517df..b763218 100644 --- a/libs/dgl/src/Window.cpp +++ b/libs/dgl/src/Window.cpp @@ -476,7 +476,7 @@ public: void setTransientWinId(const intptr_t winId) { #if defined(DGL_OS_LINUX) - XSetTransientForHint(xDisplay, xWindow, static_cast<::Window>(winId)); + XSetTransientForHint(xDisplay, xWindow, static_cast< ::Window>(winId)); #else return; // unused |