From 24d68cc55ea624dc7be3dc0a4f4071da106650ae Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emilernerfeldt@gmail.com>
Date: Sun, 28 Feb 2021 19:11:02 +0100
Subject: [PATCH] Merge epi/CHANGELOG.md into eframe/CHANGELOG.md

---
 CHANGELOG.md        |  2 +-
 eframe/CHANGELOG.md |  9 ++++++---
 epi/CHANGELOG.md    | 27 ---------------------------
 3 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 epi/CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c646ece..82a7d053 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to the egui crate will be documented in this file.
 
-NOTE: `epi`, `eframe`, `egui_web` and `egui_glium` has their own changelogs!
+NOTE: `eframe`, `egui_web` and `egui_glium` has their own changelogs!
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
diff --git a/eframe/CHANGELOG.md b/eframe/CHANGELOG.md
index 0c1a9ede..54bea8d8 100644
--- a/eframe/CHANGELOG.md
+++ b/eframe/CHANGELOG.md
@@ -7,8 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
-*  You can now set your own app icons. See https://github.com/emilk/egui/pull/193
-   for example code.
+* You can now set your own app icons. See <https://github.com/emilk/egui/pull/193> for example code.
+* You can control the initial size of the native window with `App::initial_window_size`.
+* You can control the maximum egui web canvas size with `App::max_size_points`.
+* `Frame::tex_allocator()` no longer returns an `Option` (there is always a texture allocator).
+
 
 ## 0.9.0 - 2021-02-07
 
@@ -17,7 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## 0.8.0 - 2021-01-17
 
-* Update all egui-related dependencies to `0.8.0`
+* Simplify `TextureAllocator` interface.
 
 
 ## 0.7.0 - 2021-01-04
diff --git a/epi/CHANGELOG.md b/epi/CHANGELOG.md
deleted file mode 100644
index 9f6f305c..00000000
--- a/epi/CHANGELOG.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Changelog for epi
-
-All notable changes to the `epi` crate.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
-
-## Unreleased
-
-* You can control the initial size of the native window with `App::initial_window_size`.
-* You can control the maximum egui web canvas size with `App::max_size_points`.
-* `Frame::tex_allocator()` no longer returns an `Option` (there is always a texture allocator).
-
-
-## 0.9.0 - 2021-02-07
-
-* Nothing new
-
-
-## 0.8.0 - 2021-01-17
-
-* Simplify `TextureAllocator` interface.
-
-
-## 0.7.0 - 2021-01-04
-
-* Initial release of epi, with http and persistence features.