From f53fea6d5d5cc1f4235617f7db8c691ae3d6d390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <georges.duperon@gmail.com>
Date: Wed, 11 Jul 2018 15:04:47 +0200
Subject: [PATCH] Moved Makefile one level up (part 1: rename)

---
 .gitignore                      | 20 +++++++++++++++++++-
 example-os/Makefile => Makefile |  0
 example-os/.gitignore           | 19 -------------------
 3 files changed, 19 insertions(+), 20 deletions(-)
 rename example-os/Makefile => Makefile (100%)
 delete mode 100644 example-os/.gitignore

diff --git a/.gitignore b/.gitignore
index e4be367..e6df7cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,19 @@
-/deploy-screenshots/
\ No newline at end of file
+/os.bat
+/os.ndisasm.disasm
+/os.reasm.asm
+/os.reasm
+/os.reasm.disasm
+/os.file
+/os.fdisk
+/os.arm.disasm
+/os.zip
+/os.zip.adjusted
+/os.iso
+/os.32k
+/os.fat12
+/os.offsets
+/os.hex_with_offsets
+/iso_files/os.zip
+/iso_files/boot/iso_boot.sys
+/build/offsets/fat12_start.hex
+/build/offsets/fat12_start.dec
diff --git a/example-os/Makefile b/Makefile
similarity index 100%
rename from example-os/Makefile
rename to Makefile
diff --git a/example-os/.gitignore b/example-os/.gitignore
deleted file mode 100644
index e6df7cb..0000000
--- a/example-os/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-/os.bat
-/os.ndisasm.disasm
-/os.reasm.asm
-/os.reasm
-/os.reasm.disasm
-/os.file
-/os.fdisk
-/os.arm.disasm
-/os.zip
-/os.zip.adjusted
-/os.iso
-/os.32k
-/os.fat12
-/os.offsets
-/os.hex_with_offsets
-/iso_files/os.zip
-/iso_files/boot/iso_boot.sys
-/build/offsets/fat12_start.hex
-/build/offsets/fat12_start.dec