diff options
| author | handsome_feng <445865575@qq.com> | 2015-11-10 10:07:50 +0800 | 
|---|---|---|
| committer | handsome_feng <445865575@qq.com> | 2015-11-10 10:07:50 +0800 | 
| commit | e9ea47db6b59947ab41d7942fa788bf3b4479d12 (patch) | |
| tree | 45491645d7488341f9bca581baf4ed1943dd67fb /UnityCore | |
| parent | 1c7496fb6f00097081423300c3859690cea9f6f0 (diff) | |
| parent | 7d427ba8f59b67e3c12b478d8fdfcebe8d751d67 (diff) | |
merge trunk
(bzr r4016.2.23)
Diffstat (limited to 'UnityCore')
| -rw-r--r-- | UnityCore/Scope.h | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/UnityCore/Scope.h b/UnityCore/Scope.h index 7c06c285b..3be56a4c8 100644 --- a/UnityCore/Scope.h +++ b/UnityCore/Scope.h @@ -36,7 +36,7 @@ namespace dash  typedef enum  {  G_SCOPE_ERROR_NO_ACTIVATION_HANDLER = (1 << 0), - G_SCOPE_ERROR_INVALID_PREVIEW = (2 << 0) + G_SCOPE_ERROR_INVALID_PREVIEW = (1 << 1)  } GScopeError;  GQuark | 
