From 76e17e164a80cb908eec04931d4159f1180f0dd5 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Wed, 3 Jan 2018 09:16:22 +0100 Subject: [PATCH] Updated README --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c2637ce..8f5e85a 100755 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # Morse Converter (Desktop Client) -A writtenMorse and normal morse code converter. -A detailed description about this program can be found on [marcel-kapfer.de/writtenmorse](https://marcel-kapfer.de/writtenmorse). +A writtenMorse and normal Morse code converter. +A detailed description about this program can be found on the [GitLab Wiki](https://gitlab.com/mmk2410/writtenmorse-specs/wikis/Home). ## Prerequisites - - including 2.0: Java 6 or higher - - after 2.0: Java 8 or higher + * 2.0 or later: Java 8 or higher + - 2.0 or earlier: Java 6 or higher ## Contributing @@ -16,13 +16,9 @@ A detailed description about this program can be found on [marcel-kapfer.de/writ 3. Add yourself to the CONTRIBUTORS file 4. Commit your changes (`git commit -am 'Add some feature'`) 5. Push to your branch (`git push origin my-new-feature`) -6. Create a new pull request +6. Create a new merge request -If you have any questions feel free to contact me at [marcelmichaelkapfer@yahoo.co.nz](mailto:marcelmichaelkapfer@yahoo.co.nz), [Google+](https://plus.google.com/+MarcelMichaelKapfer), [Twitter](https://twitter.com/mmk2410), [GNUsocial](https://social.mmk2410.org/mmk2410), in a room at [phab.mmk2410.org](https://phab.mmk2410.org) or join the party at [irc.mmk2410.org](irc://irc.mmk2410.org). - -If you want to contribute code to this project check if your additions match with the [Google Java Coding Guide](https://google.github.io/styleguide/javaguide.html) (you can download the XML file at [https://github.com/google/styleguide](https://github.com/google/styleguide)). - -The repository is at [gitlab.com/mmk2410/mmk2410.org](https://gitlab.com/mmk2410/mmk2410.org) and the bug tracker [phab.mmk2410.org/maniphest](https://phab.mmk2410.org/maniphest). +If you have any questions feel free to write me a mail at [me@mmk2410.org](mailto:me@mmk2410.org) or contact me on [Twitter](https://twitter.com/mmk2410). If your question is more general, don't hesitate to create an issue. ## Packages @@ -41,3 +37,7 @@ sudo apt-get install morse-converter ``` View this package repository at [Launchpad](https://launchpad.net/~mmk2410/+archive/ubuntu/morse-converter). + +#### Debian + +You can use the Ubuntu packages (or even the repository) with Debian.