55 Commits

Author	SHA1	Message	Date
Albert Vaca	f5725b7c8d	Merge branch 'master' into ssl ... # Conflicts: # build.gradle # src/org/kde/kdeconnect/Backends/BaseLink.java # src/org/kde/kdeconnect/Backends/BaseLinkProvider.java # src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java # src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java # src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java # src/org/kde/kdeconnect/BackgroundService.java # src/org/kde/kdeconnect/Device.java # src/org/kde/kdeconnect/Helpers/DeviceHelper.java # src/org/kde/kdeconnect/UserInterface/DeviceActivity.java # src/org/kde/kdeconnect/UserInterface/PairActivity.java # tests/org/kde/kdeconnect/LanLinkProviderTest.java # tests/org/kde/kdeconnect/LanLinkTest.java	2015-09-11 09:24:35 -07:00
Albert Vaca	34ec43445d	Better print something on exception	2015-09-11 03:46:23 -07:00
Albert Vaca	cf8f87b6a1	Fixed crash	2015-09-11 01:23:07 -07:00
Albert Vaca	10d9ff5a5a	Commented out some logs	2015-09-09 01:50:12 -07:00
Albert Vaca	92e4fa864a	Removed old UI	2015-09-07 02:16:23 -07:00