diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
| commit | 02819db3483514d49df7ec3f7e372b5aeb831466 (patch) | |
| tree | 6a86adac74beac293bc688dafcfa1709a6476901 /lib/edit/tr_info.txt | |
| parent | 2a61dffe127e22c1aaf955db6f085ac2eefbebba (diff) | |
| parent | 6f6de67c70fd98815088ce49f046f48f88ea35bd (diff) | |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/CMakeLists.txt
# src/config.h
# src/lua/llimits.h
Diffstat (limited to 'lib/edit/tr_info.txt')
| -rw-r--r-- | lib/edit/tr_info.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/edit/tr_info.txt b/lib/edit/tr_info.txt index e86d9617..0643f1ab 100644 --- a/lib/edit/tr_info.txt +++ b/lib/edit/tr_info.txt @@ -35,8 +35,6 @@ # I:diff:prob: :minlevel: :color # D:description -V:2.0.0 - # # stat traps # |