Merge branch 'master' into stlfixups

.gitignore

@@ -1 +1,27 @@
-build/*
+*~
+\#*
+.\#*
+*.tmproj
+tmtags
+tags
+.DS_Store
+*.swp
+*.o
+*.orig
+
+Makefile
+CMakeCache.txt
+CMakeFiles
+cmake_install.cmake
+install_manifest.txt
+build/
+
+*.user
+*.suo
+*.sdf
+*.ncb
+*.pch
+*.pdb
+[Bb]uild[Ll]og.*
+[Tt]est[Rr]esult*
+[Tt]humbs.db

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt

@@ -3,6 +3,11 @@ include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 
+if(Bink_SDK_AVAILABLE)
+	include_directories(${Bink_INCLUDE_DIR})
+endif()
+include_directories(${DirectX_INCLUDE_DIR})
+
 if(WIN32)
 	add_definitions(-DWIN32)
 endif(WIN32)