diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-10-02 10:36:55 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-10-02 10:36:55 (GMT) |
| commit | a586b10bfbf2540e282568b99a4facefa4f24853 (patch) | |
| tree | 0289f11c9e92c4c93ebf3f83f8990231279d2433 | |
| parent | f3e22526cb8464881d75cca33440fdb5425b2f29 (diff) | |
| parent | 38dde32fe71cd1617365bd56b0fa7d889b684b9d (diff) | |
| download | Qt-a586b10bfbf2540e282568b99a4facefa4f24853.zip Qt-a586b10bfbf2540e282568b99a4facefa4f24853.tar.gz Qt-a586b10bfbf2540e282568b99a4facefa4f24853.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2765,7 +2765,7 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then ipaq|sharp) CFG_ARCH=arm ;; - dm7000) + dm7000|ppc) CFG_ARCH=powerpc ;; dm800) |