Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Wed, 16 Nov 2011 23:36:18 +0000 (08:36 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Wed, 16 Nov 2011 23:36:18 +0000 (08:36 +0900)
1  2 
src/lib/Makefile.am
src/modules/engines/gl_common/evas_gl_texture.c

Simple merge