landed alert_queue feature branch into trunk

2015-04-03 20:15:48 +00:00
parent 7118387926
commit 013ed36f09
61 changed files with 2902 additions and 1393 deletions
--- a/docs/gen_reference_doc.py
+++ b/docs/gen_reference_doc.py
@@ -91,7 +91,6 @@ category_mapping = {
 	'broadcast_socket.hpp': 'Network',
 	'socket.hpp': 'Network',
 	'socket_io.hpp': 'Network',
-	'rss.hpp': 'RSS',
 	'bitfield.hpp': 'Utility',
 	'sha1_hash.hpp': 'Utility',
 	'hasher.hpp': 'Utility',