1. 19 Oct, 2016 1 commit
  2. 18 Oct, 2016 3 commits
  3. 17 Oct, 2016 2 commits
  4. 15 Oct, 2016 2 commits
  5. 11 Oct, 2016 3 commits
  6. 08 Oct, 2016 1 commit
  7. 07 Oct, 2016 2 commits
  8. 06 Oct, 2016 1 commit
  9. 05 Oct, 2016 2 commits
  10. 04 Oct, 2016 2 commits
  11. 03 Oct, 2016 1 commit
  12. 02 Oct, 2016 1 commit
  13. 01 Oct, 2016 2 commits
  14. 30 Sep, 2016 3 commits
  15. 29 Sep, 2016 7 commits
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) - always resolve ours · ec0ca397
      Script Kiddy authored
      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"
      ec0ca397
    • Script Kiddy's avatar
      SVN_SILENT made messages (after extraction) · 04165fef
      Script Kiddy authored
      04165fef
    • Albert Vaca Cintora's avatar
      Merge branch '1.x' · 54aa41d5
      Albert Vaca Cintora authored
      54aa41d5
    • Albert Vaca Cintora's avatar
      Removed old file · 68158ed5
      Albert Vaca Cintora authored
      68158ed5
    • Albert Vaca Cintora's avatar
      Merge branch '1.x' · d49d8d47
      Albert Vaca Cintora authored
      # Conflicts:
      #	plugins/telephony/kdeconnect_telephony.json
      d49d8d47
    • Albert Vaca Cintora's avatar
      d6355ab0
    • Albert Vaca Cintora's avatar
      Merge branch 'master' into 1.x · 0dbaceaf
      Albert Vaca Cintora authored
      # Conflicts:
      #	plugins/battery/kdeconnect_battery.json
      #	plugins/clipboard/kdeconnect_clipboard.json
      #	plugins/findmyphone/kdeconnect_findmyphone.json
      #	plugins/kdeconnect.notifyrc
      #	plugins/lockdevice/kdeconnect_lockdevice.json
      #	plugins/mousepad/kdeconnect_mousepad.json
      #	plugins/mpriscontrol/kdeconnect_mpriscontrol.json
      #	plugins/mprisremote/kdeconnect_mprisremote.json
      #	plugins/notifications/kdeconnect_notifications.json
      #	plugins/pausemusic/kdeconnect_pausemusic.json
      #	plugins/ping/kdeconnect_ping.json
      #	plugins/remotecommands/kdeconnect_remotecommands.json
      #	plugins/remotecontrol/kdeconnect_remotecontrol.json
      #	plugins/runcommand/kdeconnect_runcommand.json
      #	plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
      #	plugins/sendnotifications/kdeconnect_sendnotifications.json
      #	plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
      #	plugins/sftp/kdeconnect_sftp.json
      #	plugins/share/kdeconnect_share.json
      #	plugins/telephony/kdeconnect_telephony.json
      0dbaceaf
  16. 28 Sep, 2016 2 commits
  17. 27 Sep, 2016 1 commit
  18. 26 Sep, 2016 1 commit
  19. 25 Sep, 2016 2 commits
  20. 24 Sep, 2016 1 commit