diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2020-05-23 00:33:19 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2020-05-23 00:33:19 -0700 |
| commit | d6b913d3ca2e84b75f3675fd6e9f5246c100cf27 (patch) | |
| tree | 5fc28b7efc737bf2c79dc7d799e0a6013957fe11 /lib/edit/ra_info.txt | |
| parent | c42f029316c0c004a795ca170bdb50644a800534 (diff) | |
| parent | 73a0259be1d44fdb2ab34266ae0ff63f0d8f0b60 (diff) | |
Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1
Diffstat (limited to 'lib/edit/ra_info.txt')
| -rw-r--r-- | lib/edit/ra_info.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/edit/ra_info.txt b/lib/edit/ra_info.txt index 30ff3f38..6ac58484 100644 --- a/lib/edit/ra_info.txt +++ b/lib/edit/ra_info.txt @@ -1529,14 +1529,16 @@ X:20:1 T:35:0:255 W:10:1:17 C:0:0:0:0 -F:SH_FIRE | RES_FIRE +F:RES_FIRE +F:SH_FIRE N:338 X:22:1 T:35:0:255 W:10:1:20 C:0:0:0:0 -F:SH_ELEC | RES_ELEC +F:RES_ELEC +F:SH_ELEC N:339 X:18:1 @@ -1797,7 +1799,6 @@ T:40:0:255 T:45:0:255 W:1:1:12 C:0:0:0:6 -F:SEARCH N:460 X:10:1 @@ -1879,7 +1880,6 @@ X:12:1 T:39:0:255 W:1:1:10 C:0:0:0:4 -F:SEARCH N:508 X:12:1 |