You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/08/27 23:32:44 UTC

[2/7] git commit: Merge branch 'cordova-client' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-labs into cordova-client

Merge branch 'cordova-client' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-labs into cordova-client


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/commit/7c802bb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/tree/7c802bb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/diff/7c802bb8

Branch: refs/heads/cordova-client
Commit: 7c802bb886d13ec16b6709b608fae2a597d0c296
Parents: 6568ebd a963a21
Author: Fil Maj <ma...@gmail.com>
Authored: Mon Aug 27 09:37:52 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Mon Aug 27 09:37:52 2012 -0700

----------------------------------------------------------------------
 .gitignore |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/blob/7c802bb8/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 934f5f5,261372d..b5c985d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,6 +1,9 @@@
+ node_modules
+ npm-debug.log
+ temp
+ lib/**
  # OS X
  .DS_Store
 +lib
 +node_modules
 +temp