← Back to branch summary

~ubuntu-branches/ubuntu/edgy/gwenview/edgy

« back to all changes in this revision

Viewing changes to debian/patches/01_branch_updates.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2005-12-06 17:59:19 UTC
  • mfrom: (1.1.3 upstream) (2.1.1 sarge)
  • Revision ID: james.westby@ubuntu.com-20051206175919-8yv9nfmw0pws6p52
Tags: 1.3.1-0ubuntu1
* Sync with Debian
* Edit kde.mk for .pot generation

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_branch_updates.diff
 
1
--- gwenview.orig/src/imageutils/asm_scale.S
 
2
+++ gwenview.patched/src/imageutils/asm_scale.S
 
3
@@ -803,8 +803,8 @@
 
4
        popl %ebp
 
5
        ret
 
6
 
 
7
-.section       .note.GNU-stack,"",@progbits
 
8
-
 
9
 SIZE(mimageScale_mmx_AARGBA)
 
10
 
 
11
 #endif
 
12
+
 
13
+.section       .note.GNU-stack,"",@progbits