Arun's code - phpfspot.git/commit - resources/zoom-in.png

author	Andreas Unterkircher <unki@netshadow.at>
	Sun, 11 May 2008 07:42:36 +0000 (09:42 +0200)
committer	Andreas Unterkircher <unki@netshadow.at>
	Sun, 11 May 2008 07:42:36 +0000 (09:42 +0200)
commit	d97a057346bebb98be293d903a86987273cbee3e
tree	6f1ff7dc2f46b8de0bf2438447cb2f5165aa4199	tree \| snapshot
parent	b5ff85f75a27397c1ab4164fdefa9d734dc0e39d	commit \| diff
parent	7731c49b82089c7b62cc70f84edbae0d39f54fd3	commit \| diff

fix conflicts during merge of Arun's tree

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

private clone + local modifications of http://git.netshadow.at/phpfspot.git/

phpfspot.class.php	diff1 \|	diff2 \|	blob \| history
themes/default/stylesheet.css	diff1 \|	diff2 \|	blob \| history
themes/default/templates/header.tpl	diff1 \|	diff2 \|	blob \| history
themes/default/templates/index.tpl	diff1 \|	diff2 \|	blob \| history
themes/default/templates/photo_index.tpl	diff1 \|	diff2 \|	blob \| history
themes/default/templates/search.tpl	diff1 \|	diff2 \|	blob \| history
themes/default/templates/single_photo.tpl	diff1 \|	diff2 \|	blob \| history
themes/default/templates/slideshow.tpl	diff1 \|	diff2 \|	blob \| history
themes/default/templates/tags.tpl	diff1 \|	diff2 \|	blob \| history
themes/default/templates/welcome.tpl	diff1 \|	diff2 \|	blob \| history