Commit Graph

9 Commits

Author SHA1 Message Date
Peter Drahoš
e72ba0c9f5 Merge pull request #2 from ntavish/master
update to version 2.5
2015-03-04 10:57:29 +01:00
Tavish Naruka
ebac7a497e Merge branch 'master' of github.com:ntavish/dkjson
Conflicts:
	dkjson-2.5-2.rockspec
	dkjson.lua
	jsontest.lua
2015-03-04 11:37:09 +05:30
Tavish Naruka
746c00a27f fix, accidentally fetched HTML intead of raw in last commit. 2015-03-04 11:34:50 +05:30
Tavish Naruka
793e6ca877 fix, accidentally fetched HTML intead of raw in last commit. 2015-03-04 11:28:46 +05:30
Tavish Naruka
af4beb5e99 update to version 2.5 2015-03-04 11:18:07 +05:30
Peter Drahoš
7ba6b81eb2 Merge pull request #1 from dhkolf/master
updated to dkjson 2.4
2013-10-16 04:21:31 -07:00
David Heiko Kolf
9627735c66 updated to dkjson 2.4 2013-10-13 21:11:53 +02:00
Peter Drahoš
41a18483ae Initial CMake build 2013-03-05 15:17:48 +01:00
Peter Drahoš
fd5d3707dc Imported from 2.2 rock 2013-03-05 15:13:51 +01:00