Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added License
  • Loading branch information
coreybutler committed Mar 13, 2013
2 parents 36e8359 + cde7d99 commit d29fca1
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 22 deletions.
11 changes: 11 additions & 0 deletions .project
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>node-mac</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
43 changes: 22 additions & 21 deletions LICENSE
@@ -1,22 +1,23 @@
(The MIT License)

Copyright (c) 2013 Corey Butler <corey@coreybutler.com>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
(The MIT License)

Copyright (c) 2013 Corey Butler <corey@coreybutler.com>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
>>>>>>> cde7d998da6d0e206a89bdd815528b1cc7c8d45c
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13 changes: 13 additions & 0 deletions README.md
@@ -1,3 +1,4 @@
<<<<<<< HEAD
# node-mac

This is a standalone module, originally designed for internal use in [NGN](http://github.com/coreybutler/NGN).
Expand All @@ -8,3 +9,15 @@

This module helps create/manage native processes and event logs for Node.js applications on Mac OSX.

=======
# node-mac

This is a standalone module, originally designed for internal use in [NGN](http://github.com/coreybutler/NGN).
However; it is capable of providing the same features for Node.JS scripts
independently of NGN.

## Overview

This module helps create/manage native processes and event logs for Node.js applications on Mac OSX.

>>>>>>> cde7d998da6d0e206a89bdd815528b1cc7c8d45c
8 changes: 7 additions & 1 deletion lib/node-mac.js
@@ -1,3 +1,4 @@
<<<<<<< HEAD
/**
* @author Corey Butler
*/
Expand Down Expand Up @@ -110,4 +111,9 @@ Object.defineProperties(daemon,{

module.exports = daemon;

daemon.start('test','/Users/Corey/Google Drive/Development/node-mac/test.js');
daemon.start('test','/Users/Corey/Google Drive/Development/node-mac/test.js');
=======
/**
* @author Corey Butler
*/
>>>>>>> cde7d998da6d0e206a89bdd815528b1cc7c8d45c

0 comments on commit d29fca1

Please sign in to comment.