summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorAndreas Unterkircher <unki@netshadow.at>2008-05-11 09:42:36 +0200
committerAndreas Unterkircher <unki@netshadow.at>2008-05-11 09:42:36 +0200
commitd97a057346bebb98be293d903a86987273cbee3e (patch)
tree6f1ff7dc2f46b8de0bf2438447cb2f5165aa4199 /resources
parentb5ff85f75a27397c1ab4164fdefa9d734dc0e39d (diff)
parent7731c49b82089c7b62cc70f84edbae0d39f54fd3 (diff)
fix conflicts during merge of Arun's tree
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
Diffstat (limited to 'resources')
0 files changed, 0 insertions, 0 deletions