summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorChristian König <[email protected]>2010-10-23 13:54:47 +0200
committerChristian König <[email protected]>2010-10-23 13:54:47 +0200
commitba9caba9c8b8d469dbdff677274d574b9051bc45 (patch)
treeac8e797d3e7785ccd7e711fbbf8c310589954005 /configure.ac
parentb13a0af510b71e86f9634dc959dc355ea7044674 (diff)
Some more merge fixes
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions