ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,529 Commits 169 Branches 68 Tags
master
Commit Graph

93 Commits

Author SHA1 Message Date
l10n daemon script
4026bf10b2 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-05-23 01:13:55 +00:00
Tobias Fella
c755084bb0 Finish reuse compatability 2021-05-22 19:12:29 +00:00
l10n daemon script
179139c623 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-05-16 01:22:09 +00:00
l10n daemon script
407b071e04 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-05-15 01:17:21 +00:00
l10n daemon script
8f403012c2 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-05-12 01:16:37 +00:00
l10n daemon script
f9ae1f97c4 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-05-10 01:19:16 +00:00
Carl Schwan
b7d98fc6d9 Port RoomManager to C++ 
This also makes it possible to handle the Matrix URI
 2021-04-27 21:07:10 +00:00
l10n daemon script
6b21289af3 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-04-26 01:20:23 +00:00
l10n daemon script
077844ba61 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-04-12 01:15:08 +00:00
l10n daemon script
dcb135c2ca SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-04-11 01:14:47 +00:00
l10n daemon script
025f00e99d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-04-04 01:17:30 +00:00
l10n daemon script
868d8108ac SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-04-03 01:13:00 +00:00
l10n daemon script
bb3f4297b0 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-30 01:14:29 +00:00
l10n daemon script
d631731fcf SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-27 06:02:53 +01:00
l10n daemon script
128ff82958 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-25 05:53:37 +01:00
l10n daemon script
05548bc8a9 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-24 05:54:34 +01:00
l10n daemon script
dec5e40acd SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-23 05:43:12 +01:00
l10n daemon script
1bc2719665 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-22 05:28:00 +01:00
l10n daemon script
b5fda7175e SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-21 06:08:16 +01:00
l10n daemon script
c7df3f903a SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-20 06:26:36 +01:00
Nicolas Fella
361605df71 Consistently use NeoChat instead of Neochat 2021-03-19 08:05:09 +00:00
l10n daemon script
571ee638bd SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-03-17 08:06:34 +01:00
l10n daemon script
07dffa7e73 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-02-10 08:16:48 +01:00
l10n daemon script
bd4dfb037a SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-02-08 06:52:38 +01:00
l10n daemon script
e7bada4cde SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-02-07 06:47:50 +01:00
l10n daemon script
085ebaa451 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-14 07:00:09 +01:00
l10n daemon script
59df28822c SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-12 06:44:34 +01:00
l10n daemon script
cbc082c1b6 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-01 06:26:01 +01:00
l10n daemon script
4e765f51a7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-29 06:16:30 +01:00
l10n daemon script
a5cf0af004 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-26 06:13:48 +01:00
Carl Schwan
13bcb5c0ff fix icon 2020-12-17 10:16:50 +01:00
l10n daemon script
2056d75ee7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-16 06:41:07 +01:00
l10n daemon script
54b07737c0 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-14 06:06:35 +01:00
l10n daemon script
d9218b203d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-17 06:15:36 +01:00
l10n daemon script
4240d55669 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-13 06:21:10 +01:00
l10n daemon script
04020e7021 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-12 06:24:28 +01:00
l10n daemon script
91f82fb42c SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-07 06:24:31 +01:00
l10n daemon script
ed3919cb83 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-06 06:20:30 +01:00
l10n daemon script
bd0a01b235 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-05 06:31:55 +01:00
l10n daemon script
36a92be7bd SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-04 06:30:04 +01:00
Tobias Fella
c44e4544ca Add temporary icon 2020-11-03 16:57:28 +01:00
l10n daemon script
e4338a599e SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-03 06:12:27 +01:00
Tobias Fella
fbc28148a0 Cleanup cmake, metadata 2020-11-02 16:12:33 +00:00