This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/core/WindowsManager.cpp b/src/core/WindowsManager.cpp | |
index d5e022e..6dab16d 100644 | |
--- a/src/core/WindowsManager.cpp | |
+++ b/src/core/WindowsManager.cpp | |
@@ -1,6 +1,7 @@ | |
/************************************************************************** | |
* Otter Browser: Web browser controlled by the user, not vice-versa. | |
* Copyright (C) 2013 - 2014 Michal Dutkiewicz aka Emdek <michal@emdek.pl> | |
+* Copyright (C) 2014 Piotr Wójcik <chocimier@tlen.pl> | |
* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/core/WindowsManager.cpp b/src/core/WindowsManager.cpp | |
index f07fb84..024d59a 100644 | |
--- a/src/core/WindowsManager.cpp | |
+++ b/src/core/WindowsManager.cpp | |
@@ -35,10 +35,11 @@ | |
namespace Otter | |
{ | |
-WindowsManager::WindowsManager(MdiWidget *mdi, TabBarWidget *tabBar, StatusBarWidget *statusBar, bool privateSession) : QObject(mdi), | |
+WindowsManager::WindowsManager(MdiWidget *mdi, TabBarWidget *tabBar, StatusBarWidget *statusBar, MainWindow *mainWindow, bool privateSession) : QObject(mdi), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/ui/Window.cpp b/src/ui/Window.cpp | |
index bbbe0fe..f34cb0d 100644 | |
--- a/src/ui/Window.cpp | |
+++ b/src/ui/Window.cpp | |
@@ -18,6 +18,7 @@ | |
**************************************************************************/ | |
#include "Window.h" | |
+#include "../core/ActionsManager.h" | |
#include "../core/SettingsManager.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# | |
# Generated automatically from man.conf.in by the | |
# configure script. | |
# | |
# man.conf from man-1.6g | |
# | |
# For more information about this file, see the man pages man(1) | |
# and man.conf(5). | |
# | |
# This file is read by man to configure the default manpath (also used |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
. /usr/share/slax/slaxbuildlib | |
SLAX_BUNDLE_NAME="man-pages-pl" | |
SLAX_BUNDLE_VERSION="20070628" | |
SLAX_BUNDLE_DESCRIPTION="Manual pages in Polish language" | |
SLAX_BUNDLE_CATEGORIES="multilang" | |
SLAX_BUNDLES_REQUIRED="" | |
SLAX_BUNDLES_REQUIRED_TO_COMPILE_ONLY="" | |
SLAX_BUNDLE_MAINTAINER_NAME="Piotr Wójcik" | |
SLAX_BUNDLE_MAINTAINER_EMAIL="chocimier@tlen.pl" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
*** man.conf~ 2011-03-27 08:08:42.000000000 +0000 | |
--- man.conf 2013-11-29 16:16:10.759872933 +0000 | |
*************** | |
*** 93,99 **** | |
# causes problems, add the -c option to TROFF, NROFF, JNROFF. | |
# | |
TROFF /usr/bin/groff -Tps -mandoc | |
! NROFF /usr/bin/nroff -mandoc | |
JNROFF /usr/bin/groff -Tnippon -mandocj | |
EQN /usr/bin/geqn -Tps |
NewerOlder