irungentoo 57763f2737 Merge branch 'master' into harden ...

Conflicts:
	toxcore/DHT.c

2013-11-10 14:32:46 -05:00

..

crypto_test.c

Removed define that could become confusing.

2013-10-24 13:34:04 -04:00

friends_test.c

Fixed building with NaCl.

2013-09-10 17:15:26 -04:00

Makefile.inc

Reduce duplicate data. Add a mostly empty skeleton test.

2013-11-06 20:32:19 +01:00

messenger_test.c

Code cleanups.

2013-10-23 14:49:59 -04:00

network_test.c

Permit -Wshadow as useful warning.

2013-09-27 11:24:33 +02:00

skeleton_test.c

Reduce duplicate data. Add a mostly empty skeleton test.

2013-11-06 20:32:19 +01:00