Merge branch 'master' into develop-v5

2026-10-06 10:03:44 +02:00 · 2022-09-22 17:33:36 +01:00
parent 4600932d8c 63c694f65f
commit ddb678cc5b
144 changed files with 681 additions and 632 deletions
@@ -77,7 +77,6 @@ public:
    void pushText(const string& text);  // Add arbitrary text (need not be line-by-line)
    string getLine(int lineno) const;
    string ascii() const { return "ct" + cvtToStr(m_id); }
-    static int debug();
 };
 std::ostream& operator<<(std::ostream& os, VFileContent* contentp);