git.quilime.com - plog.git/commit

]> git.quilime.com - plog.git/commit

author	Gabriel Dunne <gdunne@quilime.com>
	Mon, 3 Sep 2012 23:26:02 +0000 (16:26 -0700)
committer	Gabriel Dunne <gdunne@quilime.com>
	Mon, 3 Sep 2012 23:26:02 +0000 (16:26 -0700)
commit	4d0aab7e3bdf4d83efb9bfe1f906e209620f4971
tree	6ed1643311c49ab55a6f0a367c6fb4d47ffd2dcf	tree \| snapshot
parent	32c1645f606405b4c81d33b114a6ee1f58c8970f	commit \| diff

merging into main blog branch

28 files changed:

content/projects/naag	[new file with mode: 0644]	blob
content/projects/rattle		diff \| blob \| history
content/projects/stars		diff \| blob \| history
content/projects/synonymovement		diff \| blob \| history
content/projects/test/stars copy	[new file with mode: 0755]	blob
data/.json		diff \| blob \| history
data/content/data.json	[new file with mode: 0644]	blob
data/content/news/data.json	[new file with mode: 0644]	blob
data/content/process/data.json	[new file with mode: 0644]	blob
data/content/projects/data.json	[new file with mode: 0644]	blob
data/data.json	[new file with mode: 0644]	blob
data/news.json	[deleted file]	blob \| history
data/process.json	[deleted file]	blob \| history
data/projects/data.json	[moved from data/projects.json with 70% similarity]	diff \| blob \| history
data/tag/audio.json	[deleted file]	blob \| history
data/tag/installation.json	[deleted file]	blob \| history
data/tag/performance.json	[deleted file]	blob \| history
data/tag/projection.json	[deleted file]	blob \| history
data/tag/visual.json	[deleted file]	blob \| history
data/tag/www.json	[deleted file]	blob \| history
data/tags.json		diff \| blob \| history
drafts/cabspotting	[new file with mode: 0755]	blob
index.php		diff \| blob \| history
lib/data.php		diff \| blob \| history
lib/edit.php	[new file with mode: 0644]	blob
lib/init.php		diff \| blob \| history
templates/nav.html.tpl		diff \| blob \| history
templates/projects.html.tpl		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.