diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 12:43:59 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 12:50:09 -0800 |
| commit | 76fce162659078323fcd5e54b3195dae371faca2 (patch) | |
| tree | c1d93d415b96238aae3c54eb83cb0815af2e4bca /lib/mods/theme/edit/tr_info.txt | |
| parent | b4456969cd02d75c599a5b86b225c0774697e85d (diff) | |
| parent | 4aa1a39402c3908e9e8b6eb3fd4e2183d5e5c52e (diff) | |
Merge branch 'development' into upstream
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/.gitignore
# src/maid-x11.c
# src/quest.pkg
Diffstat (limited to 'lib/mods/theme/edit/tr_info.txt')
| -rw-r--r-- | lib/mods/theme/edit/tr_info.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/mods/theme/edit/tr_info.txt b/lib/mods/theme/edit/tr_info.txt index d181487a..7f9e4df9 100644 --- a/lib/mods/theme/edit/tr_info.txt +++ b/lib/mods/theme/edit/tr_info.txt @@ -35,8 +35,6 @@ # I:diff:prob: :minlevel: :color # D:description -V:2.0.0 - # # stat traps # |