merge from v3_1_merge

This commit is contained in:
Vadim Kurland
2009-09-23 17:00:48 +00:00
750 changed files with 57546 additions and 24123 deletions
+2
View File
@@ -90,6 +90,8 @@
#undef HAVE_ANTLR_RUNTIME
#undef HAVE_QTDBUS
/*
* on some platforms (OpenBSD) the second parameter to dlopen is different
*/