Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
This commit is contained in:
Sergii Pylypenko
2014-08-19 19:21:47 +03:00
115 changed files with 4741 additions and 2376 deletions
+2 -2
View File
@@ -385,11 +385,11 @@ void OSOpenBrowser(const char *url)
args[8] = NULL;
#else
const char *args[3];
args[0] = "/usr/bin/xdg-open";
args[0] = "xdg-open";
args[1] = url;
args[2] = NULL;
#endif
execv(args[0], const_cast<char * const *>(args));
execvp(args[0], const_cast<char * const *>(args));
DEBUG(misc, 0, "Failed to open url: %s", url);
exit(0);
}