 Peter Thorson
|
22918a3992
|
Merge branch 'permessage-deflate' into develop
Conflicts:
Doxyfile
examples/utility_client/CMakeLists.txt
websocketpp/version.hpp
|
2015-07-29 09:12:21 -04:00 |
|
 Thijs Wenker
|
d3fe51fa39
|
Added missing CMake files, organized the CMake structure between test and example directories using the global variable USE_FOLDERS
|
2015-07-16 12:17:59 +02:00 |
|
|
Peter Thorson
|
4d1693c96c
|
Merge branch 'master' into permessage-deflate
Conflicts:
examples/print_server/print_server.cpp
websocketpp/extensions/permessage_deflate/enabled.hpp
|
2015-01-20 06:51:06 -05:00 |
|
 Peter Thorson
|
e8d25d22bc
|
adds documentation and removes unused parameters references #376
|
2014-10-07 10:04:54 -04:00 |
|
|
Peter Thorson
|
8ce05cd228
|
Merge branch 'master' into permessage-deflate
Conflicts:
test/extension/permessage_deflate.cpp
websocketpp/extensions/permessage_deflate/disabled.hpp
websocketpp/extensions/permessage_deflate/enabled.hpp
websocketpp/impl/connection_impl.hpp
websocketpp/message_buffer/message.hpp
websocketpp/processors/hybi13.hpp
|
2013-09-08 13:39:17 -05:00 |
|
|
Peter Thorson
|
c017331959
|
remove trailing whitespace
|
2013-07-21 07:49:15 -05:00 |
|
|
Peter Thorson
|
be9a320fc1
|
Merge branch 'master' into permessage-deflate
|
2013-07-14 11:08:51 -05:00 |
|
 Howard Butler
|
b83b054c7e
|
add CMake config for print_server and telemetry_client
|
2013-07-11 10:54:43 -05:00 |
|
|
Peter Thorson
|
ba0094a0eb
|
Merge branch 'master' into permessage-deflate
Conflicts:
examples/scratch_client/SConscript
|
2013-07-10 19:10:03 -05:00 |
|
|
Peter Thorson
|
b866e4e0ca
|
Refactors URI to be exception and regex free
|
2013-07-09 16:50:47 -05:00 |
|
|
Peter Thorson
|
243cea16db
|
update scratch examples
|
2013-07-08 11:58:43 -05:00 |
|
|
Peter Thorson
|
c32bebba3e
|
take over print server example for testing
|
2013-07-05 11:39:02 -05:00 |
|
 breyed
|
808a8ce0a9
|
fixed spelling, including "experimental" in API
|
2013-06-08 11:03:11 -05:00 |
|
|
Peter Thorson
|
c68e2207c2
|
adds print server example
|
2013-04-23 12:33:18 -05:00 |
|