[oe-commits] Koen Kooi : libgles-omap3: complete the previous commit, I suck at using git mergetool

git version control git at git.openembedded.org
Wed Feb 24 11:48:27 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5c7b09a3a7e615a2492143405c95144eb16a5304
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5c7b09a3a7e615a2492143405c95144eb16a5304

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Feb 24 12:47:22 2010 +0100

libgles-omap3: complete the previous commit, I suck at using git mergetool

---

 .../powervr-drivers/bc-cat-omap3-module/rc.bccat   |   22 ------
 .../powervr-drivers/bc-cat-omap3-module_0.1.0.bb   |    2 -
 recipes/powervr-drivers/bc-cat.inc                 |   51 ---------------
 .../libgles-omap3-3.00.00.09/rc.pvr                |   58 -----------------
 .../libgles-omap3-3.01.00.02/rc.pvr                |   68 --------------------
 recipes/powervr-drivers/libgles-omap3.inc          |   12 ++--
 .../powervr-drivers/libgles-omap3_3.00.00.01.bb    |   10 ---
 .../powervr-drivers/libgles-omap3_3.00.00.05.bb    |   12 ----
 .../powervr-drivers/libgles-omap3_3.00.00.06.bb    |   21 ------
 .../powervr-drivers/libgles-omap3_3.00.00.08.bb    |   12 ----
 .../powervr-drivers/libgles-omap3_3.00.00.09.bb    |   30 ---------
 .../powervr-drivers/libgles-omap3_3.01.00.02.bb    |    2 +-
 .../omap3-sgx-modules_1.2.12.838.bb                |   19 ------
 .../omap3-sgx-modules_1.3.13.1397.bb               |   26 --------
 .../omap3-sgx-modules_1.3.13.1607.bb               |   23 -------
 15 files changed, 7 insertions(+), 361 deletions(-)

Diff:   http://gitweb.openembedded.net/?p=openembedded.git/?a=commitdiff;h=5c7b09a3a7e615a2492143405c95144eb16a5304




More information about the Openembedded-commits mailing list