minor bug fix

Author: citronneur

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.1 - 20150708
+* Minor bug fix
+
 ## 0.2.0 - 20150707
 * Add this changelog
 * Configure keyboard layout for client side of protocol

README.md

@@ -26,7 +26,7 @@ npm install
 To create a simple rdp client : 
 
 ```javascript
-var rdp = require('rdp');
+var rdp = require('node-rdpjs');
 
 var client = rdp.createClient({ 
 	domain : 'my_domain', 
@@ -65,7 +65,7 @@ Client parameters :
 	- WARN
 	- ERROR
 
-Use decompress parameter may decrease performance.
+Use of decompress parameter impact performance.
 
 ### Client Events
 

bin/client.js

@@ -4,4 +4,8 @@
 var rdp = require("../lib");
 
 
+<<<<<<< HEAD
 rdp.createClient({ domain : 'siradel', userName : '', decompress : false, logLevel : 'INFO'}).connect('172.16.1.62', 3389);
+=======
+rdp.createClient({ domain : '', userName : '', decompress : false, logLevel : 'INFO'}).connect('', 3389);
+>>>>>>> hotfix

package.json

@@ -1,12 +1,12 @@
 {
   "name": "node-rdpjs",
   "author": "Sylvain Peyrefitte",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "engines": [
     "node = 0.10.x"
   ],
   "description": "Remote Desktop Protocol in Node.js",
-  "license": "GPL",
+  "license": "AGPL v3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/citronneur/node-rdpjs"