1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-06-19 23:36:36 +02:00

Merge with master branch

This commit is contained in:
Jfreegman
2016-09-24 23:31:20 -04:00
58 changed files with 2444 additions and 920 deletions

View File

@ -1,5 +1,5 @@
# Version
TOXIC_VERSION = 0.7.0
TOXIC_VERSION = 0.7.1
REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
ifneq (, $(findstring error, $(REV)))
VERSION = $(TOXIC_VERSION)
@ -16,7 +16,7 @@ MISC_DIR = $(BASE_DIR)/misc
# Project files
MANFILES = toxic.1 toxic.conf.5
DATAFILES = DHTnodes nameservers toxic.conf.example
DATAFILES = nameservers toxic.conf.example
DESKFILE = toxic.desktop
SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
SNDFILES += ToxicRecvMessage.wav ToxicOutgoingCall.wav ToxicIncomingCall.wav