procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
John Preston 2017-03-01 21:41:42 +03:00
parent bc76f5ee1e 195d3d13d7
commit 3da0af3550
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/CONTRIBUTING.md vendored
View File

@ -144,9 +144,13 @@ Before you submit a pull request, please test your changes. Verify that Telegram
### Write a good commit message ### Write a good commit message
Explain why you make the changes. [More infos about a good commit message.][commit_message] * Explain why you make the changes. [More infos about a good commit message.][commit_message]
Maybe reference also the related issue in your commit message.
Don't forget to [sign your patch](#sign-your-work) to put it in the public domain. * If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number][closing-issues-via-commit-messages] to your commit message.
For example: `Fix #545`
* Don't forget to [sign your patch](#sign-your-work) to put it in the public domain!
[//]: # (LINKS) [//]: # (LINKS)
[telegram]: https://telegram.org/ [telegram]: https://telegram.org/
@ -155,3 +159,4 @@ Don't forget to [sign your patch](#sign-your-work) to put it in the public domai
[commit_message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html [commit_message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
[pr]: https://github.com/telegramdesktop/tdesktop/compare [pr]: https://github.com/telegramdesktop/tdesktop/compare
[build_instructions]: https://github.com/telegramdesktop/tdesktop/blob/master/README.md#build-instructions [build_instructions]: https://github.com/telegramdesktop/tdesktop/blob/master/README.md#build-instructions
[closing-issues-via-commit-messages]: https://help.github.com/articles/closing-issues-via-commit-messages/

BIN
Telegram/Resources/art/newmsg.wav
View File

Binary file not shown.

1
Telegram/Resources/langs/download.sh
View File

@ -1,3 +1,4 @@
#!/usr/bin/env bash
set -e set -e
FullExecPath=$PWD FullExecPath=$PWD
pushd `dirname $0` > /dev/null pushd `dirname $0` > /dev/null

2
doc/building-cmake.md
View File

@ -27,7 +27,7 @@ By git – in Terminal go to **/home/user/TBuild** and run
Install dev libraries Install dev libraries
sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev libicu-dev sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev libicu-dev libdee-dev
####zlib 1.2.8 ####zlib 1.2.8