aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@gmail.com>2016-03-23 13:23:48 +0000
committerDominik Picheta <dominikpicheta@gmail.com>2016-03-23 13:23:48 +0000
commit758c2474ba89c4d84b2441fe27f55f545a8f056f (patch)
tree634d5507d4555bca6f7e475cd5ae875ee2ef8305
parentc4e67d7ee8a591b9275274b9c67cb6bc04dc1cdc (diff)
parentbc96e283041c6876ff8cc0f9646b2063a9e97fc2 (diff)
downloadpackages-758c2474ba89c4d84b2441fe27f55f545a8f056f.tar.gz
packages-758c2474ba89c4d84b2441fe27f55f545a8f056f.zip
Merge branch 'add-sam0800' of https://github.com/rgv151/packages into rgv151-add-sam0800
-rw-r--r--packages.json16
1 files changed, 16 insertions, 0 deletions
diff --git a/packages.json b/packages.json
index 5a39f36..2b553cd 100644
--- a/packages.json
+++ b/packages.json
@@ -4360,6 +4360,7 @@
"web": "https://github.com/baabelfish/mangle"
},
{
+<<<<<<< HEAD
"name": "nimshell",
"url": "https://github.com/vegansk/nimshell",
"method": "git",
@@ -4384,5 +4385,20 @@
"description": "A web DSL for Nim",
"license": "MIT",
"web": "https://github.com/andreaferretti/rosencrantz"
+ },
+ {
+ "name": "sam",
+ "url": "https://github.com/OpenSystemsLab/sam.nim",
+ "method": "git",
+ "tags": [
+ "json",
+ "binding",
+ "map",
+ "dump",
+ "load"
+ ],
+ "description": "Fast and just works JSON-Binding for Nim",
+ "license": "MIT",
+ "web": "https://github.com/OpenSystemsLab/sam.nim"
}
]