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/mods/theme/edit/al_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/mods/theme/edit/al_info.txt')
-rw-r--r-- | lib/mods/theme/edit/al_info.txt | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/mods/theme/edit/al_info.txt b/lib/mods/theme/edit/al_info.txt deleted file mode 100644 index c5e7c55d..00000000 --- a/lib/mods/theme/edit/al_info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# File: al_info.txt - - -# This file is used to initialize the "lib/raw/al_info.raw" file, which is -# used as the alchemist recipes in ToME - -# This file is intentionally blank in Theme -# because the Alchemist class has been removed. - -# Version stamp (required) - -V:2.0.0
\ No newline at end of file |