diff --git a/.classpath b/.classpath index 18bfe3a..0f49fcb 100644 --- a/.classpath +++ b/.classpath @@ -5,8 +5,7 @@ - - + diff --git a/README.md b/README.md index 993d9c2..0507d9f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Project HomeFlix is a Kellerkinder Project, that alowes you to sort all your local saved movies in clean UI. -This is the master branch, it is **only merged** with dev if a **new release** is out. +The dev branch is **only merged** into master when a **new release** is released. Please commit all changes to [dev](https://github.com/Seil0/Project-HomeFlix/tree/dev). Librarys used in this Project: JFoenix: https://github.com/jfoenixadmin/JFoenix diff --git a/bin/libraries/jfoenix-1.1.0.jar b/bin/libraries/jfoenix-1.2.0.jar similarity index 86% rename from bin/libraries/jfoenix-1.1.0.jar rename to bin/libraries/jfoenix-1.2.0.jar index 759d9d2..550230d 100644 Binary files a/bin/libraries/jfoenix-1.1.0.jar and b/bin/libraries/jfoenix-1.2.0.jar differ diff --git a/src/libraries/jfoenix-1.1.0.jar b/src/libraries/jfoenix-1.2.0.jar similarity index 86% rename from src/libraries/jfoenix-1.1.0.jar rename to src/libraries/jfoenix-1.2.0.jar index 759d9d2..550230d 100644 Binary files a/src/libraries/jfoenix-1.1.0.jar and b/src/libraries/jfoenix-1.2.0.jar differ