Merge branch 'master' of ssh://jkkn@jkkn.dk/home/git/tv2developer

author Kristian Kræmmer Nielsen <jkkn@jkkn.dk>

Thu, 20 Dec 2007 00:37:37 +0000 (01:37 +0100)

committer Kristian Kræmmer Nielsen <jkkn@jkkn.dk>

Thu, 20 Dec 2007 00:37:37 +0000 (01:37 +0100)
author Kristian Kræmmer Nielsen <jkkn@jkkn.dk>
Thu, 20 Dec 2007 00:37:37 +0000 (01:37 +0100)
committer Kristian Kræmmer Nielsen <jkkn@jkkn.dk>
Thu, 20 Dec 2007 00:37:37 +0000 (01:37 +0100)
diff --cc content/tv2developer-quickbox.js
Simple merge
diff --cc content/tv2developer.js
Simple merge
diff --cc version

index a3df0a6959e154733da89a5d6063742ce6d5b851,e7c7d3cc3c89ada8384d34fee65534801993b979..8adc70fdd9d6a086cc636d251adf0c7a7bca8319
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.8.0
- -0.7.8
++0.8.0
author	Kristian Kræmmer Nielsen <jkkn@jkkn.dk>
	Thu, 20 Dec 2007 00:37:37 +0000 (01:37 +0100)
committer	Kristian Kræmmer Nielsen <jkkn@jkkn.dk>
	Thu, 20 Dec 2007 00:37:37 +0000 (01:37 +0100)
		1	2
content/tv2developer-quickbox.js	patch \|	diff1 \|	diff2 \|	blob \| history
content/tv2developer.js	patch \|	diff1 \|	diff2 \|	blob \| history
version	patch \|	diff1 \|	diff2 \|	blob \| history