summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-12-11 13:11:15 -0500
committerAlex Deucher <alex@botch2.(none)>2007-12-11 13:11:15 -0500
commit3c22ad977c25d5ca2811821fcac6bb8ecd79994a (patch)
tree08e4a2e826092957d1d9e1396eca5c41c816b4fd /configure.ac
parentc9a0cee97ca69e8fe1e1937c7670fa903214cded (diff)
parentf3d2ec3a5ae61215c792018320158750e7aa937c (diff)
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
fix conflicts
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions