commit 8fa95f966088f13b14895aefea87b6c5f0cc78eb
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 17 07:51:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 17 07:51:28 2010 -0700
tree 6bcaa747f260fa3946bb9ae7ab73b6955e5e43b7
parent aa3061dab61f9a0960cd85972fb5279bb7a8d51a
parent 838336fa61f2f06898322f059570708def823398

am 838336fa: am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"

Merge commit '838336fa61f2f06898322f059570708def823398'

* commit '838336fa61f2f06898322f059570708def823398':
  pixelflinger: Fix function naming typo: gglBitBlti

include/pixelflinger/pixelflinger.h

diff --git a/include/pixelflinger/pixelflinger.h b/include/pixelflinger/pixelflinger.h
index dca0b90..8a2b442 100644
--- a/include/pixelflinger/pixelflinger.h
+++ b/include/pixelflinger/pixelflinger.h
@@ -315,7 +315,7 @@
 ssize_t gglInit(GGLContext** context);
 ssize_t gglUninit(GGLContext* context);
 
-GGLint gglBitBlti(
+GGLint gglBitBlit(
         GGLContext* c,
         int tmu,
         GGLint crop[4],

libpixelflinger/raster.cpp

diff --git a/libpixelflinger/raster.cpp b/libpixelflinger/raster.cpp
index d751202..32b2a97 100644
--- a/libpixelflinger/raster.cpp
+++ b/libpixelflinger/raster.cpp
@@ -143,7 +143,7 @@
 
 using namespace android;
 
-GGLint gglBitBlti(GGLContext* con, int tmu, GGLint crop[4], GGLint where[4])
+GGLint gglBitBlit(GGLContext* con, int tmu, GGLint crop[4], GGLint where[4])
 {
     GGL_CONTEXT(c, (void*)con);