Skip to content

Commit 09f3e55

Browse files
committed
Harmomized with private Mercurial repo.
1 parent e12b680 commit 09f3e55

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
ext/
22
build/
3+
.hgtags
4+
.hg/
5+
*.pro.user
6+
CMakeLists.txt.user
37

.hgignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ ext/*
44
doc/html
55
*.vpp~*
66
CMakeLists.txt.user
7+
.git

README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
<!-- ---------------------------------------------------------------------------
2-
Copyright Butterfly Energy Systems 2014-2015.
3-
Distributed under the Boost Software License, Version 1.0.
4-
(See accompanying file LICENSE_1_0.txt or copy at
5-
http://www.boost.org/LICENSE_1_0.txt)
6-
---------------------------------------------------------------------------- -->
7-
81
CppWAMP
92
=======
103

114
C++11 client library for the [WAMP][wamp] protocol.
125

136
**Features**:
7+
148
- Supports the [WAMP Basic Profile][wamp-basic]
159
- Roles: _Caller_, _Callee_, _Subscriber_, _Publisher_
1610
- Transports: TCP and Unix domain raw sockets (with and without handshaking support)
@@ -23,6 +17,7 @@ C++11 client library for the [WAMP][wamp] protocol.
2317
- Permissive license (Boost)
2418

2519
**Dependencies**:
20+
2621
- [Boost.Asio][boost-asio] for raw socket transport
2722
- [Boost.Endian][boost-endian] (requires [Boost][boost] 1.57.0 or greater)
2823
- [RapidJSON][rapidjson]
@@ -51,11 +46,13 @@ CHANGE WITHOUT WARNING.**
5146

5247
Installation
5348
-------------
49+
5450
- [Using as a Header-Only Library](https://github.com/ecorm/cppwamp/wiki/Header-Only-Use)
5551
- [Building Library, Unit Tests, and Examples](https://github.com/ecorm/cppwamp/wiki/Building)
5652

5753
Documentation
5854
-------------
55+
5956
- [Tutorial](https://github.com/ecorm/cppwamp/wiki/Tutorial)
6057
- [Reference Documentation](http://ecorm.github.io/cppwamp/doc/index.html)
6158

@@ -170,4 +167,4 @@ DEALINGS IN THE SOFTWARE.
170167
```
171168
172169
* * *
173-
_Copyright &copy; Butterfly Energy Systems, 2014-2015_
170+
_Copyright © Butterfly Energy Systems, 2014-2015_

examples/chat/chat.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ LIBS += -pthread
7373

7474
#Assets to deploy with executable
7575
deploy.files += $$files(assets/*)
76-
crossbar.files += $$files(./.crossbar/*)
76+
crossbar.files += $$files(../.crossbar/*)
7777

7878
#Add the deployment files to the install list
7979
INSTALLS += deploy crossbar

0 commit comments

Comments
 (0)