summaryrefslogtreecommitdiffstats
path: root/conf/Makefile
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2010-01-08 22:20:09 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2010-01-08 22:20:09 +0100
commit974363c172e026b00be5f78ec585dda1e402b6f6 (patch)
tree0a9ed20fa7e2937cad60ae4728ec00aafc337070 /conf/Makefile
parent99f5fc14cd457f71973bc2264566284049ccfb2c (diff)
parent844e0f65dbab98f71f2a5631277a720613d4d7a5 (diff)
downloadbird-974363c172e026b00be5f78ec585dda1e402b6f6.tar
bird-974363c172e026b00be5f78ec585dda1e402b6f6.zip
Merge commit 'origin/master' into new
Diffstat (limited to 'conf/Makefile')
0 files changed, 0 insertions, 0 deletions