Merge branch 'urras-master'

This commit is contained in:
irungentoo 2015-05-23 15:15:32 -04:00
commit 8c568a2cec
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -22,9 +22,9 @@ EXTRA_DIST = \
$(top_srcdir)/docs/updates/Crypto.md \ $(top_srcdir)/docs/updates/Crypto.md \
$(top_srcdir)/docs/updates/Spam-Prevention.md \ $(top_srcdir)/docs/updates/Spam-Prevention.md \
$(top_srcdir)/docs/updates/Symmetric-NAT-Transversal.md \ $(top_srcdir)/docs/updates/Symmetric-NAT-Transversal.md \
$(top_srcdir)/tools/README \ $(top_srcdir)/other/astyle/README \
$(top_srcdir)/tools/astylerc \ $(top_srcdir)/other/astyle/astylerc \
$(top_srcdir)/tools/pre-commit $(top_srcdir)/other/astyle/pre-commit
if BUILD_AV if BUILD_AV