[Pkg-javascript-commits] [node-detective] 48/119: modernize, fix conflicts

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-detective.

commit aa50907db2b4bcd86d511bc0006e7a39cdfcbd70
Merge: 07ead9a 06d5cb4
Author: James Halliday <mail at substack.net>
Date:   Fri Mar 1 17:13:05 2013 -0800

    modernize, fix conflicts

 .gitignore   |  1 +
 index.js     |  8 +++-----
 package.json | 15 ++++-----------
 test/both.js |  2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --cc package.json
index 08ebe2e,e74ff22..936a242
--- a/package.json
+++ b/package.json
@@@ -1,7 -1,7 +1,7 @@@
  {
      "name" : "detective",
      "description" : "Find all calls to require() no matter how crazily nested using a proper walk of the AST",
-     "version" : "1.1.0",
 -    "version" : "0.3.0-dz0",
++    "version" : "2.0.0",
      "repository" : {
          "type" : "git",
          "url" : "git://github.com/substack/node-detective.git"
@@@ -13,22 -13,23 +13,15 @@@
          "analyze",
          "ast"
      ],
--    "directories" : {
--        "lib" : ".",
--        "example" : "example",
--        "test" : "test"
--    },
      "scripts" : {
          "test" : "tap test/*.js"
      },
      "dependencies" : {
-         "esprima" : "~1.0.2"
+         "esprima" : "1.0.2",
+         "escodegen": "0.0.15"
      },
      "devDependencies" : {
--        "tap" : "~0.2.6"
--    },
--    "engines" : {
--        "node" : ">=0.6.0"
++        "tap" : "~0.4.0"
      },
      "license" : "MIT",
      "author" : {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-detective.git