From: Niki Roo Date: Thu, 2 Jan 2020 15:15:19 +0000 (+0100) Subject: Merge commit '7a455971fed716123933d0f685a0d6eebcf3282b' X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=d3ab274f9152618a8bc21a0a20caed1a8520b224;hp=c4cefaa04ec122fc02efb6542451a31fdf722c32 Merge commit '7a455971fed716123933d0f685a0d6eebcf3282b' --- diff --git a/src/jexer/src/jexer/EditMenuUser.java b/src/jexer/EditMenuUser.java similarity index 100% rename from src/jexer/src/jexer/EditMenuUser.java rename to src/jexer/EditMenuUser.java diff --git a/src/jexer/src/jexer/THelpWindow.java b/src/jexer/THelpWindow.java similarity index 100% rename from src/jexer/src/jexer/THelpWindow.java rename to src/jexer/THelpWindow.java diff --git a/src/jexer/src/jexer/THelpWindow.properties b/src/jexer/THelpWindow.properties similarity index 100% rename from src/jexer/src/jexer/THelpWindow.properties rename to src/jexer/THelpWindow.properties diff --git a/src/jexer/src/jexer/backend/HeadlessBackend.java b/src/jexer/backend/HeadlessBackend.java similarity index 100% rename from src/jexer/src/jexer/backend/HeadlessBackend.java rename to src/jexer/backend/HeadlessBackend.java diff --git a/src/jexer/src/jexer/bits/Clipboard.java b/src/jexer/bits/Clipboard.java similarity index 100% rename from src/jexer/src/jexer/bits/Clipboard.java rename to src/jexer/bits/Clipboard.java diff --git a/src/jexer/src/jexer/demos/Demo8.java b/src/jexer/demos/Demo8.java similarity index 100% rename from src/jexer/src/jexer/demos/Demo8.java rename to src/jexer/demos/Demo8.java diff --git a/src/jexer/src/jexer/demos/Demo8.properties b/src/jexer/demos/Demo8.properties similarity index 100% rename from src/jexer/src/jexer/demos/Demo8.properties rename to src/jexer/demos/Demo8.properties diff --git a/src/jexer/src/jexer/help/HelpFile.java b/src/jexer/help/HelpFile.java similarity index 100% rename from src/jexer/src/jexer/help/HelpFile.java rename to src/jexer/help/HelpFile.java diff --git a/src/jexer/src/jexer/help/HelpFile.properties b/src/jexer/help/HelpFile.properties similarity index 100% rename from src/jexer/src/jexer/help/HelpFile.properties rename to src/jexer/help/HelpFile.properties diff --git a/src/jexer/src/jexer/help/Link.java b/src/jexer/help/Link.java similarity index 100% rename from src/jexer/src/jexer/help/Link.java rename to src/jexer/help/Link.java diff --git a/src/jexer/src/jexer/help/THelpText.java b/src/jexer/help/THelpText.java similarity index 100% rename from src/jexer/src/jexer/help/THelpText.java rename to src/jexer/help/THelpText.java diff --git a/src/jexer/src/jexer/help/TParagraph.java b/src/jexer/help/TParagraph.java similarity index 100% rename from src/jexer/src/jexer/help/TParagraph.java rename to src/jexer/help/TParagraph.java diff --git a/src/jexer/src/jexer/help/TWord.java b/src/jexer/help/TWord.java similarity index 100% rename from src/jexer/src/jexer/help/TWord.java rename to src/jexer/help/TWord.java diff --git a/src/jexer/src/jexer/help/Topic.java b/src/jexer/help/Topic.java similarity index 100% rename from src/jexer/src/jexer/help/Topic.java rename to src/jexer/help/Topic.java diff --git a/src/jexer/src/jexer/help/Topic.properties b/src/jexer/help/Topic.properties similarity index 100% rename from src/jexer/src/jexer/help/Topic.properties rename to src/jexer/help/Topic.properties diff --git a/src/jexer/src/jexer/help/package-info.java b/src/jexer/help/package-info.java similarity index 100% rename from src/jexer/src/jexer/help/package-info.java rename to src/jexer/help/package-info.java