Merge branch 'frameworks' into work/frameworks-Mac
commit 5d88c1bc Err... debug to stderr, of course commit 040035e3 Add option to send debug output to terminal commit f3274d69 Remove windows-only setInternet2-option. No longer supported by R. (Essentially, setInternet2(TRUE) is the new default behavior since R 3.2.2). commit e8df47d8 Give backend thread a chance to shutdown properly. Should fix the "QProcess: Destroyed while process still running" warning. commit dbb07612 Fix display of plots in output window on Windows. commit 69cf554b More compilation and runtime fixes for Windows. commit 6ea53cf9 Windows-specific compilation and startup fixes. commit 1945fa6d Fix initialization bug. commit fbbc9cbd Fix previous commit commit 3e2b9a16 Replace locale update hack with Qt's new mechnism for updating the current default QTextCodec. Also, use QTextEncoder / QTextDecoder to get defined behavior on non-representable characters. This should hopefully fix a crash on startup on Windows. commit f8515deb Comment commit ec772dcc Fix file detection on Windows 64bit
Please register or sign in to comment