aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@gmail.com>2015-11-25 11:10:33 +0000
committerDominik Picheta <dominikpicheta@gmail.com>2015-11-25 11:10:33 +0000
commite68eea56a1949a56fed7b5a60513e4d18142e8e4 (patch)
tree976218e512024367f7f1b1a34b21f7ff9af69f37
parent6693928e76886fe1a014493de6486760b62c9bdd (diff)
parenta773e798c2dafcd5b6b3338ee136c53a159f857c (diff)
downloadpackages-e68eea56a1949a56fed7b5a60513e4d18142e8e4.tar.gz
packages-e68eea56a1949a56fed7b5a60513e4d18142e8e4.zip
Merge branch 'master' of https://github.com/twist-vector/packages into twist-vector-master
-rw-r--r--packages.json27
1 files changed, 27 insertions, 0 deletions
diff --git a/packages.json b/packages.json
index 1442b33..953b53e 100644
--- a/packages.json
+++ b/packages.json
@@ -3589,6 +3589,7 @@
"web": "https://github.com/theduke/nim-nimlog"
},
{
+<<<<<<< HEAD
"name": "values",
"url": "https://github.com/theduke/nim-values",
"method": "git",
@@ -3600,5 +3601,31 @@
"description": "Library for working with arbitrary values + a map data structure.",
"license": "MIT",
"web": "https://github.com/theduke/nim-values"
+=======
+ "name": "geohash",
+ "url": "https://github.com/twist-vector/nim-geohash.git",
+ "method": "git",
+ "tags": [
+ "library",
+ "geocoding",
+ "pure"
+ ],
+ "description": "Nim implementation of the geohash latitude/longitude geocode system",
+ "license": "Apache License 2.0",
+ "web": "https://github.com/twist-vector/nim-geohash"
+ },
+ {
+ "name": "bped",
+ "url": "https://github.com/twist-vector/nim-bped.git",
+ "method": "git",
+ "tags": [
+ "library",
+ "serialization",
+ "pure"
+ ],
+ "description": "Nim implementation of the Bittorrent ascii serialization protocol",
+ "license": "Apache License 2.0",
+ "web": "https://github.com/twist-vector/nim-bped"
+>>>>>>> a773e798c2dafcd5b6b3338ee136c53a159f857c
}
]