diff options
| author | Christian König <[email protected]> | 2010-10-28 20:24:56 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-10-28 20:24:56 +0200 |
| commit | 41ed47d6b8fb6c032e2907ef2e49e414c26f35c1 (patch) | |
| tree | 8cf267ee3ac5d8b530dd70a28a0d568344aa8304 /configs | |
| parent | 97a7cf230a70c64fff300931ae7c00aa00449c97 (diff) | |
| parent | 5479fa34d9acebd55f68c23a278cf382d0e84248 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
Conflicts:
src/gallium/include/pipe/p_format.h
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 9bdbefebddd..e2d70c63a12 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -53,7 +53,7 @@ MKDEP_OPTIONS = @MKDEP_OPTIONS@ INSTALL = @INSTALL@ # Python and flags (generally only needed by the developers) -PYTHON2 = python +PYTHON2 = @PYTHON2@ PYTHON_FLAGS = -t -O -O # Library names (base name) |