summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-10-21 19:05:40 -0600
committerBrian Paul <[email protected]>2010-10-21 19:05:47 -0600
commit69a07be3e527dbc2148a4e20c50e60266225f5f2 (patch)
tree82583b98708fc7a6c33b471d45670e2566ed0daf /configure.ac
parent1d91f8d9164b38b4c924f43ec4fc5ceb65c96a78 (diff)
parentb2d4dfe5cc5b24743175bf35285dfc57f86bc09d (diff)
Merge branch 'primitive-restart-cleanup'
Conflicts: docs/relnotes-7.10.html This branch is a re-do of the primitive-restart branch with all the intermediate/temporary stuff cleaned out.
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions