[zhu3d/f17: 5/5] Merge master for Zhu3d 4.2.6

[siddharths]

commit 93dd93a0f053aacc9612544161393ad5cf850d60
Merge: 9cfed94 3c068dd
Author: Siddharth Sharma <siddharth.kde at gmail.com>
Date:   Sat May 18 14:38:58 2013 +0530

    Merge master for Zhu3d 4.2.6

 .gitignore |    1 +
 sources    |    2 +-
 zhu3d.spec |   21 ++++++++++++++-------
 3 files changed, 16 insertions(+), 8 deletions(-)
---
diff --cc zhu3d.spec
index 51e18e4,2241ced..a95a73c
--- a/zhu3d.spec
+++ b/zhu3d.spec
@@@ -80,8 -89,7 +89,6 @@@ rm -rf %{buildroot
  
  * Fri Mar 2 2012 siddvicious <siddharth.kde at gmail.com> - 4.2.4-1
  - Package Update
- >>>>>>> master
--
  * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-4
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild