[bullet: 12/14] update master

[Thomas Kowaliczek]

commit b68226f9e929b3fc0cfdef96eb0b576379463588
Merge: a6bbb41 a1e4605
Author: LinuxDonald <linuxdonald at linuxdonald.de>
Date:   Wed Sep 29 01:36:14 2010 +0200

    update master

 .gitignore                        |    1 +
 bullet-2.75-cmake_pkgconfig.patch |   23 -------------------
 bullet.pc.cmake                   |    6 -----
 bullet.spec                       |   45 ++++++++++++++++++++++++++++---------
 lib_suffix.patch                  |   44 ------------------------------------
 sources                           |    1 +
 6 files changed, 36 insertions(+), 84 deletions(-)
---
diff --cc bullet.spec
index d80a50f,faf65a3..09fa451
--- a/bullet.spec
+++ b/bullet.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name: bullet
++<<<<<<< HEAD
 +Version: 2.75
 +Release: 4%{?dist}
++=======
+ Version: 2.77
+ Release: 2%{?dist}
++>>>>>>> f14
  Summary: 3D Collision Detection and Rigid Body Dynamics Library
  Group: Development/Libraries
  License: zlib and MIT and BSD
@@@ -119,6 -127,13 +132,16 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Wed Sep 29 2010 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.77-2
+ - Added LibSuffix patch
+ 
+ * Wed Sep 29 2010 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.77-1
+ - Updatet to version 2.77
+ - Droped all patches because they are all in upstream
+ 
++>>>>>>> f14
  * Sat Aug 21 2010 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.75-4
  - Hope fix (#599495)