Merge branch 'master' of https://github.com/HemulGM/VKAudioPlayer # Conflicts: # VKAP.Main.dfm # VKAP.Main.pas # VKAudioPlayer.dproj
Merge branch 'master' of https://github.com/HemulGM/VKAudioPlayer # Conflicts: # VKAP.Main.dfm # VKAP.Main.pas # VKAudioPlayer.dproj