Commits · d0fad804eae674c4434a6bf1eef123355bafb895 · Maui / Communicator

28 Sep, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d0fad804

Script Kiddy authored Sep 28, 2020

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"

d0fad804

25 Sep, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 421335e8

Script Kiddy authored Sep 25, 2020

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"

421335e8

24 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c9eee20f

Script Kiddy authored Jul 24, 2020

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"

c9eee20f

22 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 427dfa32

Script Kiddy authored Jul 22, 2020

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"

427dfa32

18 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 371b4a4b

Script Kiddy authored Jun 18, 2020

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"

371b4a4b

17 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b26cb3d4

Script Kiddy authored Jun 17, 2020

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"

b26cb3d4

15 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e34f6730

Script Kiddy authored Jun 15, 2020

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"

e34f6730

10 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 48f19605

Script Kiddy authored Jun 10, 2020

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"

48f19605

19 May, 2020 2 commits
- Merge branch 'development' · d0d11e40
  Camilo Higuita authored May 19, 2020
  
  d0d11e40
- add logo · 4342c8b4
  Camilo Higuita authored May 19, 2020
  
  4342c8b4
17 May, 2020 2 commits
- Bump version · 52d8e1ea
  Anupam Basak authored May 18, 2020
  
  52d8e1ea
- Bump version · 01f10b4e
  Anupam Basak authored May 18, 2020
  
  01f10b4e
09 May, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 1fceba6c

Script Kiddy authored May 09, 2020

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"

1fceba6c

22 Apr, 2020 1 commit
- update to mauikit new page dialog thingy · 4ea0f003
  camilo higuita authored Apr 22, 2020
  
  4ea0f003
16 Apr, 2020 1 commit
- update to latest from upstream · ca50f410
  camilo higuita authored Apr 16, 2020
  
  ca50f410
05 Apr, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 94381bd7

Script Kiddy authored Apr 05, 2020

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"

94381bd7

23 Mar, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 68d19121

Script Kiddy authored Mar 23, 2020

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"

68d19121

20 Mar, 2020 1 commit
- spacing not longer in maui girdview · f9e28951
  camilo higuita authored Mar 19, 2020
  
  f9e28951
17 Mar, 2020 2 commits
- Merge branch 'master' of invent.kde.org:kde/maui-dialer · 7e30dfbe
  camilo higuita authored Mar 16, 2020
  
  7e30dfbe
- using the appview attched property now and appviews · 91e91751
  camilo higuita authored Mar 16, 2020
  
  91e91751
01 Mar, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3e365749

Script Kiddy authored Mar 01, 2020

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"

3e365749

29 Feb, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 61436485

Script Kiddy authored Feb 29, 2020

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"

61436485

20 Feb, 2020 1 commit
- update · 598d99b9
  Camilo Higuita authored Feb 19, 2020
  
  598d99b9
19 Feb, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 76f3e6f0

Script Kiddy authored Feb 19, 2020

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"

76f3e6f0

04 Feb, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 23ebd338

Script Kiddy authored Feb 04, 2020

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"

23ebd338

03 Feb, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 6455cb0e

Script Kiddy authored Feb 03, 2020

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"

6455cb0e

02 Feb, 2020 2 commits
- Merge branch 'master' of invent.kde.org:kde/maui-dialer · 360b5ab7
  camilo higuita authored Feb 02, 2020
  
  360b5ab7
- changes · 4a7f3acf
  camilo higuita authored Feb 02, 2020
  
  4a7f3acf
27 Jan, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c092f3cb

Script Kiddy authored Jan 27, 2020

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"

c092f3cb

25 Jan, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d062b61c

Script Kiddy authored Jan 25, 2020

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"

d062b61c

24 Jan, 2020 4 commits
- quick start to using mauikti template models · f7102662
  camilo higuita authored Jan 24, 2020
  
  f7102662
- Merge branch 'master' of invent.kde.org:kde/maui-dialer · f739947a
  camilo higuita authored Jan 24, 2020
  
  f739947a
- fixes undefined proeprties usage · 8a431600
  camilo higuita authored Jan 24, 2020
  
  8a431600
- Fix typo in filename causing error · 9824a725
  Anupam Basak authored Jan 24, 2020
  
  9824a725
23 Jan, 2020 4 commits
- update name and icon for androdi and deksotp file · fee0d8eb
  camilo higuita authored Jan 23, 2020
  
  fee0d8eb
- rmeove cache stuff · b23f7c6e
  camilo higuita authored Jan 22, 2020
  
  b23f7c6e
- undefine dprops fixes · 175aad8b
  camilo higuita authored Jan 22, 2020
  
  175aad8b
- bring back to life and now renamed to contacts and using all the right assets... · 61c94184
  camilo higuita authored Jan 22, 2020
```
bring back to life and now renamed to contacts and using all the right assets and working on android with newest run time permission... partrially
```
  61c94184
22 Jan, 2020 1 commit
- fixes · 83476570
  camilo higuita authored Jan 22, 2020
  
  83476570
18 Jan, 2020 1 commit
- super quick fixes · fe6efa9e
  camilo higuita authored Jan 18, 2020
  
  fe6efa9e