diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
| commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
| tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/desktops/kde-4.5/pim45/boost-1.44.diff | |
| parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
| parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
| download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip | |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/desktops/kde-4.5/pim45/boost-1.44.diff')
| -rw-r--r-- | pkgs/desktops/kde-4.5/pim45/boost-1.44.diff | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff b/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff deleted file mode 100644 index 7c5ab9ef31b1..000000000000 --- a/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/kleopatra/crypto/gui/newresultpage.cpp b/kleopatra/crypto/gui/newresultpage.cpp -index 96d1cb2..5c7281a 100644 ---- a/kleopatra/crypto/gui/newresultpage.cpp -+++ b/kleopatra/crypto/gui/newresultpage.cpp -@@ -40,6 +40,7 @@ - #include <crypto/taskcollection.h> - - #include <utils/stl_util.h> -+#include <boost/mem_fn.hpp> - - #include <KLocalizedString> - |