projects / phpfspot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: c1811f2 88e26f8)
fix conflict in phpfspot.class.php
authorAndreas Unterkircher <unki@netshadow.at>
Mon, 18 Aug 2008 04:16:37 +0000 (06:16 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Mon, 18 Aug 2008 04:16:37 +0000 (06:16 +0200)
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

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