summary refs log tree commit diff
path: root/dist.ini
diff options
context:
space:
mode:
authorfranck cuny <franck@lumberjaph.net>2010-11-02 15:32:45 +0100
committerfranck cuny <franck@lumberjaph.net>2010-11-02 15:32:45 +0100
commit5573fc78e8b093cea69578d715634259815a5c07 (patch)
treed0e91eade3880c426e78ebd7d20f9fab5a219ba9 /dist.ini
parentpulling the =build me a link= logic in to a single method and then wrapping t... (diff)
parentMerge branch 'master' of github.com:robinedwards/net-riak (diff)
downloadnet-riak-5573fc78e8b093cea69578d715634259815a5c07.tar.gz
resolved merge conflict
Diffstat (limited to 'dist.ini')
0 files changed, 0 insertions, 0 deletions