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 -r edccf8cc52e3 -r 5abe2b02ec8a CMake/Packages/FindFreetype.cmake | |
--- a/CMake/Packages/FindFreetype.cmake Fri Jun 20 00:53:20 2014 +0200 | |
+++ b/CMake/Packages/FindFreetype.cmake Fri Oct 03 00:11:51 2014 +0200 | |
@@ -43,7 +43,7 @@ | |
findpkg_framework(FREETYPE) | |
message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") | |
-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) | |
+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) | |
find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) |
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 -r edccf8cc52e3 CMake/Packages/FindFreetype.cmake | |
--- a/CMake/Packages/FindFreetype.cmake Fri Jun 20 00:53:20 2014 +0200 | |
+++ b/CMake/Packages/FindFreetype.cmake Fri Oct 03 00:01:16 2014 +0200 | |
@@ -43,7 +43,7 @@ | |
findpkg_framework(FREETYPE) | |
message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") | |
-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) | |
+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) | |
find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) |
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/python/setup.py b/python/setup.py | |
index ac367d0..322e99b 100644 | |
--- a/python/setup.py | |
+++ b/python/setup.py | |
@@ -22,7 +22,7 @@ from setuptools import setup, find_packages | |
from setuptools.command import test | |
REQUIRE = [ | |
- "python-dateutil>=1.4,<2", | |
+ "python-dateutil>=1.4", |
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/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm | |
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm Sat Sep 27 20:56:56 2014 +0200 | |
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm Thu Oct 02 22:35:36 2014 +0200 | |
@@ -282,6 +282,8 @@ | |
} | |
mWindow = [mView window]; | |
+ [mWindow retain]; | |
+ | |
mIsExternal = true; |
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 -r edccf8cc52e3 RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm | |
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm Fri Jun 20 00:53:20 2014 +0200 | |
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm Thu Oct 02 00:33:03 2014 +0200 | |
@@ -118,7 +118,7 @@ | |
NSString *windowTitle = [NSString stringWithCString:name.c_str() encoding:NSUTF8StringEncoding]; | |
int winx = 0, winy = 0; | |
int depth = 32; | |
- NameValuePairList::const_iterator opt(NULL); | |
+ NameValuePairList::const_iterator opt; | |
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
######################################################## | |
## CROSS COMPILING TRANSMISSION 2.82 FOR WD MY CLOUD ## | |
######################################################## | |
This is a guide to compile transmission 2.82 for the WD MyCloud 2/3/4 TB. | |
Because I didn't want to install the build tools and dependencies on my NAS I chose to | |
setup a cross-compiler toolchain on my x86_64 Ubuntu 12.04 machine and create a .deb package | |
that can be installed on the NAS. Furthermore the cross compiler can be used to compile anything for the My Cloud (printer drivers, etc.) |
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
{ | |
"alt-speed-down": 50, | |
"alt-speed-enabled": false, | |
"alt-speed-time-begin": 540, | |
"alt-speed-time-day": 127, | |
"alt-speed-time-enabled": false, | |
"alt-speed-time-end": 1020, | |
"alt-speed-up": 50, | |
"bind-address-ipv4": "0.0.0.0", | |
"bind-address-ipv6": "::", |
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/sh | |
### BEGIN INIT INFO | |
# Provides: transmission-daemon | |
# Required-Start: networking | |
# Required-Stop: networking | |
# Default-Start: 2 3 5 | |
# Default-Stop: 0 1 6 | |
# Short-Description: Start the transmission BitTorrent daemon client. | |
### END INIT INFO |
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
# | |
# Automatically generated make config: don't edit | |
# crosstool-NG 1.19.0 Configuration | |
# Sun Dec 1 17:11:51 2013 | |
# | |
CT_CONFIGURE_has_xz=y | |
CT_CONFIGURE_has_svn=y | |
CT_MODULES=y | |
# |
NewerOlder