summaryrefslogtreecommitdiff
path: root/lib/string.in.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-06-02 22:49:33 +0200
committerAndy Wingo <wingo@pobox.com>2011-06-02 22:49:33 +0200
commit46da7909e1f67c13284730344e971d293df890c0 (patch)
tree5acc96a0834b5d9be7df59ef5a126ccfb8f53a8c /lib/string.in.h
parent6fc3eae4772bc2c5dc3e2b377ca481eef9aa52f5 (diff)
parent715146aa15982b0d38b242f7811ac64addeb7ecc (diff)
downloadguile-46da7909e1f67c13284730344e971d293df890c0.tar.gz
Merge remote-tracking branch 'local-2.0/stable-2.0'
Conflicts: meta/Makefile.am
Diffstat (limited to 'lib/string.in.h')
0 files changed, 0 insertions, 0 deletions