Skip to content
Browse files

Merge branch 'master' of github.com:ifit/Geolib

  • Loading branch information...
2 parents 488a9f0 + 7e0a663 commit 83a12d190b69b1bb259d034e03b9888a5755f6ba @grobot grobot committed
Showing with 70 additions and 37 deletions.
  1. +33 −0 .gitignore
  2. +37 −37 package.json
View
33 .gitignore
@@ -0,0 +1,33 @@
+lib-cov
+*.seed
+*.log
+*.node
+*.o
+*.o.d
+*.mk
+*.gypi
+*.cache.py
+*.wafpickle-7
+*.lock-wscript
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+*.swp
+.DS_Store
+dump.rdb
+.jshintrc
+
+pids
+logs
+results
+
+/public/js/app.js
+/public/css/style.css
+npm-debug.log
+/client/config.js
+.build
+/docs
+
+/node_modules
View
74 package.json
@@ -1,38 +1,38 @@
{
- "name": "geolib",
- "homepage": "http://github.com/manuelbieh/Geolib",
- "author": {
- "name": "Manuel Bieh",
- "url": "http://www.manuelbieh.com/"
- },
- "bin": {
- "geolib": "./geolib.js"
- },
- "repository": {
- "type": "git",
- "url": "http://github.com/manuelbieh/geolib.git"
- },
- "dependencies": {
- "googlemaps": "git+ssh://git@github.com:ifit/node-googlemaps.git#master"
- },
- "devDependencies": {
- "mocha": "*"
- },
- "licenses": [
- {
- "type": "LGPL",
- "url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
- }
- ],
- "files": [
- "geolib.js"
- ],
- "description": "Library to perform geo specific tasks",
- "keywords": [
- "geolocation",
- "geo",
- "distance"
- ],
- "version": "1.1.8",
- "main": "./geolib"
-}
+ "name": "geolib",
+ "homepage": "http://github.com/manuelbieh/Geolib",
+ "author": {
+ "name": "Manuel Bieh",
+ "url": "http://www.manuelbieh.com/"
+ },
+ "bin": {
+ "geolib": "./geolib.js"
+ },
+ "repository": {
+ "type": "git",
+ "url": "http://github.com/manuelbieh/geolib.git"
+ },
+ "licenses": [
+ {
+ "type": "LGPL",
+ "url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
+ }
+ ],
+ "files": [
+ "geolib.js"
+ ],
+ "description": "Library to perform geo specific tasks",
+ "keywords": [
+ "geolocation",
+ "geo",
+ "distance"
+ ],
+ "version": "1.1.8",
+ "main": "./geolib",
+ "dependencies": {
+ "googlemaps": "git+ssh://git@github.com:ifit/node-googlemaps.git#master"
+ },
+ "devDependencies": {
+ "mocha": "*"
+ }
+}

0 comments on commit 83a12d1

Please sign in to comment.
Something went wrong with that request. Please try again.