tomprince

diff --git a/generic/pg-user.el b/generic/pg-user.el
index 9ff2206..5aaefa1 100644
--- a/generic/pg-user.el
+++ b/generic/pg-user.el
@@ -1317,7 +1317,7 @@ assuming the undo-in-region behavior will apply if ARG is non-nil."
 	  (goto-char (point-max))
 	  (proof-assert-until-point 
 	   (if proof-multiple-frames-enable 
-	       'no-minibuffer-messages ; nb: not API
+	       '(no-minibuffer-messages) ; nb: not API

tomprince

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb0f7f3..80c4c37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,6 @@ endif(COMMAND cmake_policy)
 # allow empty else and endif constructs (available by default since 2.6.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
-# prevent in-source builds
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})

tomprince

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb0f7f3..80c4c37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,6 @@ endif(COMMAND cmake_policy)
 # allow empty else and endif constructs (available by default since 2.6.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
-# prevent in-source builds
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})

tomprince

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb0f7f3..80c4c37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,6 @@ endif(COMMAND cmake_policy)
 # allow empty else and endif constructs (available by default since 2.6.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
-# prevent in-source builds
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})

tomprince

diff --git a/gemrb/core/EffectQueue.cpp b/gemrb/core/EffectQueue.cpp
index ca980d6..ca0757e 100644
--- a/gemrb/core/EffectQueue.cpp
+++ b/gemrb/core/EffectQueue.cpp
@@ -1152,7 +1152,7 @@ int EffectQueue::ApplyEffect(Actor* target, Effect* fx, ieDword first_apply, ieD
 			case FX_PERMANENT:
 				//don't stick around if it was executed permanently
 				//for example, a permanent strength modifier effect
-				if( (fx->TimingMode == FX_DURATION_INSTANT_PERMANENT) ) {
+				if(fx->TimingMode == FX_DURATION_INSTANT_PERMANENT) {

tomprince

Require Import
  Relation_Definitions Morphisms.

Global Generalizable All Variables.
Global Set Automatic Introduction.

Class Equiv A := equiv: relation A.

Infix "=" := equiv: type_scope.

tomprince

diff --git a/master/buildbot/status/web/builder.py b/master/buildbot/status/web/builder.py
index 4cee3bc..6a25a3f 100644
--- a/master/buildbot/status/web/builder.py
+++ b/master/buildbot/status/web/builder.py
@@ -162,7 +162,7 @@ class StatusResourceBuilder(HtmlResource, BuildLineMixin):
                  % (html.escape(name), html.escape(reason)))
             return master.addBuildset(
                     builderNames=[self.builder_status.getName()],
-                    ssid=ssid, reason=r, properties=None)
+                    ssid=ssid, reason=r, properties=properties)

tomprince

diff --git a/master/buildbot/clients/tryclient.py b/master/buildbot/clients/tryclient.py
index e9fa2ff..5a1b078 100644
--- a/master/buildbot/clients/tryclient.py
+++ b/master/buildbot/clients/tryclient.py
@@ -252,6 +252,17 @@ class GitExtractor(SourceStampExtractor):
         self.baserev = res.strip()
 
     def parseStatus(self, res):
+        # If a branch is specified, parse out the rev it points to
+        # and extract the local name (assuming it has a slash).

tomprince

diff --git a/gemrb/core/EffectQueue.cpp b/gemrb/core/EffectQueue.cpp
index ca980d6..624b7ea 100644
--- a/gemrb/core/EffectQueue.cpp
+++ b/gemrb/core/EffectQueue.cpp
@@ -423,10 +423,9 @@ Effect *EffectQueue::CreateUnsummonEffect(Effect *fx)
 	return newfx;
 }
 
-void EffectQueue::AddEffect(Effect* fx, bool insert)
+void EffectQueue::AddEffect(Effect const& fx, bool insert)

tomprince

diff --git a/master/buildbot/sourcestamp.py b/master/buildbot/sourcestamp.py
index dd78e44..aca6067 100644
--- a/master/buildbot/sourcestamp.py
+++ b/master/buildbot/sourcestamp.py
@@ -108,7 +108,7 @@ class SourceStamp(util.ComparableMixin, styles.Versioned):
         return d
 
     def __init__(self, branch=None, revision=None, patch=None,
-                 changes=None, project='', repository='', fromSsdict=False):
+                 changes=None, project=None, repository=None, fromSsdict=False):