Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FreeRDP/Remmina.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Ollier <larchunix@users.noreply.github.com>2018-05-18 10:25:34 +0300
committerDenis Ollier <larchunix@users.noreply.github.com>2018-05-18 10:25:34 +0300
commit088e72c56cfa9240aef6be15c17cbed9aefeeb0c (patch)
tree439d05a6121734ec6f356fbf5abd289b20e53bde
parent649aaa73396f1fb32a0e7af5087b7c2baccb5c80 (diff)
next -> master switch
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--README.md6
-rw-r--r--flatpak/README.md2
-rw-r--r--flatpak/org.remmina.Remmina.json2
4 files changed, 7 insertions, 7 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eb7edae53..594a3661b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,7 +49,7 @@ of which some that have a [bounty](https://github.com/FreeRDP/Remmina/issues?mil
### Internal projects
-- Refactorying [remmina_connection_window.c](https://github.com/FreeRDP/Remmina/blob/next/remmina/src/remmina_connection_window.c) as it is big, complicated and hard to extend.
+- Refactorying [remmina_connection_window.c](https://github.com/FreeRDP/Remmina/blob/master/remmina/src/remmina_connection_window.c) as it is big, complicated and hard to extend.
- Simplify the user interface.
- Separate plugin processes from the main process to improve stability.
- Write an additional plugin system to write plugins also in Python and eventually Ruby.
@@ -79,7 +79,7 @@ If you rather prefer to contribute to Remmina with money you are more than welco
For more informations See the [Remmina web site donation page](http://remmina.org/wp/donations).
-See the [THANKS.md](https://raw.githubusercontent.com/FreeRDP/Remmina/next/THANKS.md) file for an exhaustive list of supporters.
+See the [THANKS.md](https://raw.githubusercontent.com/FreeRDP/Remmina/master/THANKS.md) file for an exhaustive list of supporters.
#### Paypal
diff --git a/README.md b/README.md
index 05f0642c2..5bc204dbc 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ You can configure everything from the graphical interface or editing by hand the
## Contributing
-See [CONTRIBUTING.md](https://raw.githubusercontent.com/FreeRDP/Remmina/next/CONTRIBUTING.md) for a better overview.
+See [CONTRIBUTING.md](https://raw.githubusercontent.com/FreeRDP/Remmina/master/CONTRIBUTING.md) for a better overview.
If you want to contribute with code:
@@ -201,7 +201,7 @@ If you rather prefer to contribute to Remmina with money you are more than welco
For more informations See the [Remmina web site donation page](http://remmina.org/wp/donations).
-See the [THANKS.md](https://raw.githubusercontent.com/FreeRDP/Remmina/next/THANKS.md) file for an exhaustive list of supporters.
+See the [THANKS.md](https://raw.githubusercontent.com/FreeRDP/Remmina/master/THANKS.md) file for an exhaustive list of supporters.
#### Paypal
@@ -224,7 +224,7 @@ Remmina is maintained by:
* [Giovanni Panozzo](https://github.com/giox069)
* [Dario Cavedon](https://github.com/ic3d)
-See the [AUTHORS](https://raw.githubusercontent.com/FreeRDP/Remmina/next/AUTHORS) for an exhaustive list.
+See the [AUTHORS](https://raw.githubusercontent.com/FreeRDP/Remmina/master/AUTHORS) for an exhaustive list.
If you are not listed and you have contributed, feel free to update that file.
## Resources
diff --git a/flatpak/README.md b/flatpak/README.md
index a6b1bc74b..75dc5f8e5 100644
--- a/flatpak/README.md
+++ b/flatpak/README.md
@@ -1,7 +1,7 @@
Precompiled binaries
-----------------
-See [the wiki](https://github.com/FreeRDP/Remmina/wiki#for-users-with-a-distro-that-supports-flatpak-including-ubuntu) for instructions. The recipe here is always pointed to the `next` branch. The recipe in [the flathub repository](https://github.com/flathub/org.remmina.Remmina/blob/master/org.remmina.Remmina.json) is pointed to the latest tagged release. Files except the JSON file in this directory is used for automatic builds.
+See [the wiki](https://github.com/FreeRDP/Remmina/wiki#for-users-with-a-distro-that-supports-flatpak-including-ubuntu) for instructions. The recipe here is always pointed to the `master` branch. The recipe in [the flathub repository](https://github.com/flathub/org.remmina.Remmina/blob/master/org.remmina.Remmina.json) is pointed to the latest tagged release. Files except the JSON file in this directory is used for automatic builds.
Build instructions
------------------
diff --git a/flatpak/org.remmina.Remmina.json b/flatpak/org.remmina.Remmina.json
index c1987e797..1bc0734df 100644
--- a/flatpak/org.remmina.Remmina.json
+++ b/flatpak/org.remmina.Remmina.json
@@ -389,7 +389,7 @@
{
"type": "git",
"url": "https://github.com/FreeRDP/Remmina.git",
- "branch": "next"
+ "branch": "master"
}
]
}