Merge branch 'fetch'
Conflicts: packages.json
This commit is contained in:
commit
b6069d4d62
2 changed files with 57 additions and 1 deletions
|
|
@ -85,6 +85,7 @@
|
|||
"license": "zlib",
|
||||
"web": "https://github.com/Vladar4/libtcod-nim"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
{
|
||||
"name": "nimepak",
|
||||
"url": "git://github.com/gradha/epak/",
|
||||
|
|
@ -99,6 +100,8 @@
|
|||
"license": "Allegro 4 Giftware",
|
||||
"web": "https://github.com/gradha/epak"
|
||||
},
|
||||
=======
|
||||
>>>>>>> fetch
|
||||
{
|
||||
"name": "nimgame",
|
||||
"url": "git://github.com/Vladar4/nimgame/",
|
||||
|
|
@ -2974,6 +2977,18 @@
|
|||
"license": "MIT",
|
||||
"web": "https://christine.website/projects/Vardene"
|
||||
},
|
||||
{
|
||||
"name": "quadtree",
|
||||
"url": "https://github.com/Nycto/QuadtreeNim",
|
||||
"method": "git",
|
||||
"tags": [
|
||||
"quadtree",
|
||||
"algorithm"
|
||||
],
|
||||
"description": "A Quadtree implementation",
|
||||
"license": "MIT",
|
||||
"web": "https://github.com/Nycto/QuadtreeNim"
|
||||
},
|
||||
{
|
||||
"name": "expat",
|
||||
"url": "https://github.com/nim-lang/expat",
|
||||
|
|
@ -3001,4 +3016,4 @@
|
|||
"license": "LGPL",
|
||||
"web": "https://github.com/Araq/sphinx"
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue