Merge branch 'development' into upstream

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

# Conflicts:
#	src/.gitignore
#	src/maid-x11.c
#	src/quest.pkg

1 files changed, 12 insertions, 0 deletions

diff --git a/src/quark.hpp b/src/quark.hpp
new file mode 100644
index 00000000..0fce3932
--- /dev/null
+++ b/src/quark.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "h-basic.h"
+
+/**
+ * Maximum number of quarks.
+ */
+constexpr int QUARK_MAX = 768;
+
+void quark_init();
+cptr quark_str(s16b num);
+s16b quark_add(cptr str);