Commit Graph

117 Commits

Author SHA1 Message Date
Christian Kamm
9e43327037 Revert "This branch is now 2.7"
This reverts commit ae6c92dc18.

Retargeted PR to 2.6 that had master commits :/
2019-05-16 08:24:11 +02:00
Christian Kamm
ae6c92dc18 This branch is now 2.7 2019-05-16 08:15:24 +02:00
Olivier Goffart
597acba274 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	VERSION.cmake
	src/common/syncjournaldb.cpp
	src/libsync/propagatedownload.cpp
2019-02-08 12:48:31 +01:00
Markus Goetz
0b8d591d29 VERSION.cmake / ChangeLog: Fix dates 2019-02-08 12:27:32 +01:00
Markus Goetz
1f0914b3fb VERSION.cmake: This is now 2.5.4 2019-02-05 21:14:59 +01:00
Markus Goetz
1506c95d8c VERSION.cmake: This branch is now 2.5.3 2019-01-15 20:13:08 +01:00
Markus Goetz
b5fbbdff31 VERSION.cmake: This is 2.5.2 2018-11-04 21:04:58 +01:00
Markus Goetz
5cd9082bea VERSION.cmake: This branch is 2.5.1 2018-09-26 11:43:39 -04:00
Olivier Goffart
a0a6e9fabc Increase version 2018-05-29 11:24:05 +02:00
Christian Kamm
86b30e36c2 Merge remote-tracking branch 'origin/2.4' 2018-03-12 10:24:25 +01:00
Markus Goetz
8ba27cb0f1 VERSION.cmake: This is 2.4.2 now 2018-02-20 12:13:58 +01:00
Markus Goetz
067508c082 VERSION.cmake: This branch is now 2.4.1 2017-12-20 16:03:35 +01:00
Christian Kamm
8865405a32 Version: master branch is future 2.5 now 2017-10-24 09:56:16 +02:00
Olivier Goffart
d30ed7fb8a VERSION: master branch is 2.4 2017-03-03 11:00:33 +01:00
Olivier Goffart
84ecbc4c89 2.3.0 was released: Update version 2017-03-03 10:48:47 +01:00
Klaas Freitag
35d4b96339 Set base version to 2.3.0. For 2.2, please use the branch 2.2 2016-04-25 14:15:17 +02:00
Daniel Molkentin
e3b56fb559 Add file description, copyright to win32 VERSIONINFO struct 2016-02-16 16:19:12 +01:00
Markus Goetz
40395bdc0e VERSION.cmake: master is now 2.2 2015-11-17 15:47:46 +01:00
Markus Goetz
c80b033466 VERSION.cmake: fixup 2015-10-19 15:57:13 +02:00
Markus Goetz
00485e133f VERSION.cmake: This is git not rc1 2015-10-19 15:51:33 +02:00
Olivier Goffart
df135a0bb2 Merge branch '2.0'
Conflicts:
	src/gui/folder.cpp
2015-10-19 10:57:37 +02:00
Klaas Freitag
d6098c39dc Update Changelog and bump version to 2.0.2rc1 2015-10-16 11:12:50 +02:00
Markus Goetz
963eb1f29b VERSION.cmake: master is 2.1 2015-10-15 16:51:29 +02:00
Daniel Molkentin
7aeb27d5ee Bump 2.0 brancht to 2.0.2 after creation of 2.0.1 branch 2015-08-31 16:50:07 +02:00
Klaas Freitag
2d421a8275 Push version on to 2.0.1 git 2015-08-25 10:24:52 +02:00
Klaas Freitag
2ad57ee8ab Bump version to 2.0.0 final, some Changlog addings 2015-08-24 14:23:54 +02:00
Klaas Freitag
4eadaeafc9 Bump version to rc2 2015-08-21 15:59:27 +02:00
Daniel Molkentin
7317e9af61 No beta note in nightly builds 2015-08-15 02:56:30 +02:00
Markus Goetz
485dde8fb5 VERSION.cmake: Bump to 2.0 beta2 2015-08-14 12:37:41 +02:00
Daniel Molkentin
aade9111d4 ownCloud Client 2.0 beta1 2015-08-06 18:20:07 +02:00
Daniel Molkentin
24f751d981 master is 2.0 2015-05-06 16:59:23 +02:00
Markus Goetz
2e4e031795 Declare master as 1.9.0git 2015-04-20 11:22:19 +02:00
Daniel Molkentin
3f3f27d4d3 1.8.1 beta 1 2015-04-15 15:33:17 +02:00
Klaas Freitag
38ef525d5e Push version to final 1.8.0 2015-03-16 15:28:58 +01:00
Klaas Freitag
12e5306947 Set version postfix to rc1 2015-03-12 11:21:23 +01:00
Klaas Freitag
b6e24cbd45 Push version to beta3 2015-03-06 16:41:59 +01:00
Klaas Freitag
07e60b9161 Bump version to 1.8.0 beta2. 2015-03-04 12:29:17 +01:00
Klaas Freitag
17570acab2 Bump version to 1.8.0beta1 2015-02-13 11:57:05 +01:00
Markus Goetz
c4dd64940e Update VERSION.cmake 2015-01-05 15:47:27 +01:00
Daniel Molkentin
a2e5a6628d v1.7.1 2014-12-22 11:38:07 +01:00
Daniel Molkentin
63712de170 1.7.1 rc1 2014-12-16 07:30:23 +01:00
Klaas Freitag
131747ea4b Bumped version to 1.7.1 beta1 2014-12-09 15:25:37 +01:00
Daniel Molkentin
776f4dc316 v1.7.0 2014-11-06 15:53:17 +01:00
Klaas Freitag
0e828d802e Bump version to 1.7.0rc1 2014-10-24 18:20:41 +02:00
Markus Goetz
81584c6d51 VERSION.cmake: rc1 2014-10-23 12:22:07 +02:00
Daniel Molkentin
ac48fbae9c 1.7.0 beta4 2014-10-20 10:28:47 +02:00
Klaas Freitag
ed5a8ab090 Push version to beta3 2014-10-03 11:37:00 +02:00
Klaas Freitag
fee18dd457 Push version to beta2 2014-10-01 21:04:13 +02:00
Klaas Freitag
6025b3a91b Bump version to beta1 2014-08-21 14:33:03 +02:00
Klaas Freitag
600a6d9346 Bumped version to alpha1 2014-08-08 10:57:09 +02:00