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:
authorAntenore Gatta <antenore@simbiosi.org>2016-12-22 11:59:08 +0300
committerAntenore Gatta <antenore@simbiosi.org>2016-12-22 11:59:08 +0300
commit8a9f3de821047fd6217bcc6f05828b2002cce7e6 (patch)
tree569f75193e7157b1a80b5af8ee7c953bab884544
parentf8ff38846751f414f20052e8f670be6a6094b0a0 (diff)
Updated contributors and version numberv1.2.0-rcgit.17
-rw-r--r--AUTHORS6
-rw-r--r--CMakeLists.txt2
-rw-r--r--remmina/ui/remmina_about.glade12
3 files changed, 16 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index a519c8e26..79977f0e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@ Authors of Remmina Project
Antenore Gatta <antenore@simbiosi.org>
Antonio Guillen <antonio@guillen.com.es>
Armin Novak <armin.novak@gmail.com>
+ Balázs Meskó <meskobalazs@gmail.com>
Ben Kohler <bkohler@gmail.com>
Benjamin Podszun <benjamin.podszun@gmail.com>
Christian Persch <chpe@gnome.org>
@@ -25,6 +26,7 @@ Authors of Remmina Project
dupondje <jean-louis@dupondje.be>
Egmont Koblinger <egmont@gmail.com>
Emmanuel Grognet <emmanuel@grognet.fr>
+ e-alfred <e-alfred@users.noreply.github.com>
Frank Bongrand <fbongrand@free.fr>
Funda Wang <fundawang@gmail.com>
Giovanni Panozzo <giovanni@panozzo.it>
@@ -37,6 +39,7 @@ Authors of Remmina Project
Jerad Simpson <jbsimpson@gmail.com>
Jeremy Bicha <jbicha@ubuntu.com>
Johannes Weberhofer (weberho) <jweberhofer@weberhofer.at>
+ Jose Gregorio Jimenez Sanchez <josegjimenez@gmail.com>
Jörgen Viksell <jviksell@gmail.com>
Julian Ospald <hasufell@posteo.de>
Justin Zobel <justin.zobel@gmail.com>
@@ -45,10 +48,12 @@ Authors of Remmina Project
Luca Falavigna <dktrkranz@debian.org>
Matteo Nastasi <nastasi@alternativeoutput.it>
Marc-André Moreau <marcandre.moreau@gmail.com>
+ Marco Trevisan (Treviño) <mail@3v1n0.net>
Michele Sartori <mik.thrasher@aol.com>
Meskó Balázs <meskobalazs@gmail.com>
Mike Dalessio <mike@csa.net>
Mike Gilbert <floppym@gentoo.org>
+ morph027 <morphsen@gmx.com>
Nekhelesh Ramananthan <krnekhelesh@gmail.com>
Nikolay Martynov <mar.kolya@gmail.com>
Nils Steinger <git@n-st.de>
@@ -63,6 +68,7 @@ Authors of Remmina Project
Stefan Heitmüller (morph027) <morphsen@gmx.com>
Shuhrat Dehkanov <k@efir.uz>
Swen Kooij <photonios@outlook.com>
+ theraser <mail@hegerfeld.org>
Vic Lee (llyzs) <llyzs.vic@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bf29b2e8..cc9beb02f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ set(WITH_LIBRARY_VERSIONING "ON")
set(REMMINA_VERSION_MAJOR "1")
set(REMMINA_VERSION_MINOR "2")
set(REMMINA_VERSION_REVISION "0")
-set(REMMINA_VERSION_SUFFIX "rcgit-16")
+set(REMMINA_VERSION_SUFFIX "rcgit-17")
set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}")
if (NOT ${REMMINA_VERSION_SUFFIX} STREQUAL "")
set(REMMINA_VERSION "${REMMINA_VERSION}-${REMMINA_VERSION_SUFFIX}")
diff --git a/remmina/ui/remmina_about.glade b/remmina/ui/remmina_about.glade
index 69116e8b3..0bb6bbad7 100644
--- a/remmina/ui/remmina_about.glade
+++ b/remmina/ui/remmina_about.glade
@@ -48,13 +48,15 @@ Andrey Gankov &lt;gankov@opensuse.org&gt;
Antenore Gatta &lt;antenore@simbiosi.org&gt;
Antonio Guillen &lt;antonio@guillen.com.es&gt;
Armin Novak &lt;armin.novak@gmail.com&gt;
+Balázs Meskó &lt;meskobalazs@gmail.com&gt;
Ben Kohler &lt;bkohler@gmail.com&gt;
Benjamin Podszun &lt;benjamin.podszun@gmail.com&gt;
Christian Persch &lt;chpe@gnome.org&gt;
Christopher Rawlings &lt;chris.rawlings+git@gmail.com&gt;
-Dark Penguin &lt;darkpenguin@yandex.ru&gt;
+Fabio Castelli (muflone) &lt;muflone@vbsimple.net&gt;
Daniel M. Weeks &lt;dan@danweeks.net&gt;
Daniele Tieghi &lt;notdisclosed&gt;
+Dark Penguin &lt;darkpenguin@yandex.ru&gt;
Davy Defaud &lt;davy.defaud@free.fr&gt;
Denis Ollier &lt;larchunix@users.noreply.github.com&gt;
Dennis Koot &lt;koter84@gmail.com&gt;
@@ -63,7 +65,7 @@ Dmitry Kubatkin &lt;maelnor@gmail.com&gt;
dupondje &lt;jean-louis@dupondje.be&gt;
Egmont Koblinger &lt;egmont@gmail.com&gt;
Emmanuel Grognet &lt;emmanuel@grognet.fr&gt;
-Fabio Castelli (muflone) &lt;muflone@vbsimple.net&gt;
+e-alfred &lt;e-alfred@users.noreply.github.com&gt;
Frank Bongrand &lt;fbongrand@free.fr&gt;
Funda Wang &lt;fundawang@gmail.com&gt;
Giovanni Panozzo &lt;giovanni@panozzo.it&gt;
@@ -76,6 +78,7 @@ Jen Herting &lt;jen@herting.cc&gt;
Jerad Simpson &lt;jbsimpson@gmail.com&gt;
Jeremy Bicha &lt;jbicha@ubuntu.com&gt;
Johannes Weberhofer (weberho) &lt;jweberhofer@weberhofer.at&gt;
+Jose Gregorio Jimenez Sanchez &lt;josegjimenez@gmail.com&gt;
Jörgen Viksell &lt;jviksell@gmail.com&gt;
Julian Ospald &lt;hasufell@posteo.de&gt;
Justin Zobel &lt;justin.zobel@gmail.com&gt;
@@ -84,10 +87,12 @@ Kyle Sanderson &lt;kyle.leet@gmail.com&gt;
Luca Falavigna &lt;dktrkranz@debian.org&gt;
Matteo Nastasi &lt;nastasi@alternativeoutput.it&gt;
Marc-André Moreau &lt;marcandre.moreau@gmail.com&gt;
+Marco Trevisan (Treviño) &lt;mail@3v1n0.net&gt;
Michele Sartori &lt;mik.thrasher@aol.com&gt;
Meskó Balázs &lt;meskobalazs@gmail.com&gt;
Mike Dalessio &lt;mike@csa.net&gt;
Mike Gilbert &lt;floppym@gentoo.org&gt;
+morph027 &lt;morphsen@gmx.com&gt;
Nekhelesh Ramananthan &lt;krnekhelesh@gmail.com&gt;
Nikolay Martynov &lt;mar.kolya@gmail.com&gt;
Nils Steinger &lt;git@n-st.de&gt;
@@ -99,9 +104,10 @@ Rex Tsai &lt;chihchun@kalug.linux.org.tw&gt;
Robert Ancell &lt;robert.ancell@canonical.com&gt;
Romero B. de S. Malaquias &lt;romero.malaquias@gmail.com&gt;
Sebastian Geiger &lt;sbastig@gmx.net&gt;
-Shuhrat Dehkanov &lt;k@efir.uz&gt;
Stefan Heitmüller (morph027) &lt;morphsen@gmx.com&gt;
+Shuhrat Dehkanov &lt;k@efir.uz&gt;
Swen Kooij &lt;photonios@outlook.com&gt;
+theraser &lt;mail@hegerfeld.org&gt;
Vic Lee (llyzs) &lt;llyzs.vic@gmail.com&gt;
</property>
<property name="documenters">Dario Cavedon &lt;dcavedon@gmail.com&gt;</property>