[Gemrb-commits] gemrb: branch master updated. v0.6.2-1613-ga7d909a

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a7d909ac05f2df93041e93a8f54b50faa47f9820 (commit)
       via  9e4e682bc45f7ec3db95bdd1b6ef7312fc2abb09 (commit)

Summary of changes:
 gemrb/includes/strrefs.h        |    3 ++-
 gemrb/override/bg1/strings.2da  |    1 +
 gemrb/override/bg2/strings.2da  |    1 +
 gemrb/override/how/strings.2da  |    1 +
 gemrb/override/iwd/strings.2da  |    1 +
 gemrb/override/iwd2/strings.2da |    1 +
 gemrb/override/pst/strings.2da  |    1 +
 7 files changed, 8 insertions(+), 1 deletions(-)
      from  0f0037a9347080f5c55294c160e54ea2b1f6318c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=a7d909ac05f2df93041e93a8f54b50faa47f9820

commit a7d909ac05f2df93041e93a8f54b50faa47f9820
Merge: 9e4e682 0f0037a
Author: Avenger <ave...@so...>
Date:   Sat Aug 27 15:47:41 2011 +0200

    Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb


http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=9e4e682bc45f7ec3db95bdd1b6ef7312fc2abb09

commit 9e4e682bc45f7ec3db95bdd1b6ef7312fc2abb09
Author: Avenger <ave...@so...>
Date:   Sat Aug 27 15:46:53 2011 +0200

    allocated chaosshield strref

diff --git a/gemrb/includes/strrefs.h b/gemrb/includes/strrefs.h
index 6ceeb04..7eedb32 100644
--- a/gemrb/includes/strrefs.h
+++ b/gemrb/includes/strrefs.h
@@ -202,6 +202,7 @@
 #define STR_AURACLEANSED 169
 #define STR_INDOOR_FAIL 170
 #define STR_SPELL_FAILED 171
-#define STRREF_COUNT 172
+#define STR_CHAOSSHIELD 172
+#define STRREF_COUNT 173
 
 #endif //! IE_STRINGS_H
diff --git a/gemrb/override/bg1/strings.2da b/gemrb/override/bg1/strings.2da
index d030c69..81acd69 100644
--- a/gemrb/override/bg1/strings.2da
+++ b/gemrb/override/bg1/strings.2da
@@ -173,3 +173,4 @@ NOSEE_NOCAST -1
 AURACLEANSED 23797
 INDOOR_FAIL 9744
 SPELL_DISRUPTED 14796
+CHAOSSHIELD -1
diff --git a/gemrb/override/bg2/strings.2da b/gemrb/override/bg2/strings.2da
index b305d93..f7aa5ea 100644
--- a/gemrb/override/bg2/strings.2da
+++ b/gemrb/override/bg2/strings.2da
@@ -173,3 +173,4 @@ NOSEE_NOCAST 46529
 AURACLEANSED 23797
 INDOOR_FAIL 9744
 SPELL_DISRUPTED 14796
+CHAOSSHIELD -1
diff --git a/gemrb/override/how/strings.2da b/gemrb/override/how/strings.2da
index 4d9fe97..832bbec 100644
--- a/gemrb/override/how/strings.2da
+++ b/gemrb/override/how/strings.2da
@@ -173,3 +173,4 @@ NOSEE_NOCAST -1
 AURACLEANSED 23797
 INDOOR_FAIL 9744
 SPELL_DISRUPTED 14796
+CHAOSSHIELD -1
diff --git a/gemrb/override/iwd/strings.2da b/gemrb/override/iwd/strings.2da
index f76b381..1ed2d63 100644
--- a/gemrb/override/iwd/strings.2da
+++ b/gemrb/override/iwd/strings.2da
@@ -173,3 +173,4 @@ NOSEE_NOCAST -1
 AURACLEANSED 23797
 INDOOR_FAIL 9744
 SPELL_DISRUPTED 14796
+CHAOSSHIELD -1
diff --git a/gemrb/override/iwd2/strings.2da b/gemrb/override/iwd2/strings.2da
index d7292f8..b0f802b 100644
--- a/gemrb/override/iwd2/strings.2da
+++ b/gemrb/override/iwd2/strings.2da
@@ -173,3 +173,4 @@ NOSEE_NOCAST -1
 AURACLEANSED 23797
 INDOOR_FAIL 9744
 SPELL_DISRUPTED 14796
+CHAOSSHIELD -1
diff --git a/gemrb/override/pst/strings.2da b/gemrb/override/pst/strings.2da
index dc99606..25a1ad5 100644
--- a/gemrb/override/pst/strings.2da
+++ b/gemrb/override/pst/strings.2da
@@ -173,3 +173,4 @@ NOSEE_NOCAST -1
 AURACLEANSED -1
 INDOOR_FAIL -1
 SPELL_DISRUPTED -1
+CHAOSSHIELD -1

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator