API tools faq
paste
Advertisement
trini

Untitled

trini
Jul 13th, 2011
169
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.67 KB | None | 0 0
raw download clone embed print report
  1. diff -urpN T1/libsamplerate-0.1.7/ChangeLog T2/libsamplerate-0.1.7/ChangeLog
  2. --- T1/libsamplerate-0.1.7/ChangeLog    2009-02-14 17:17:35.000000000 -0700
  3. +++ T2/libsamplerate-0.1.7/ChangeLog    2009-02-14 04:37:27.000000000 -0700
  4. @@ -11,7 +11,7 @@
  5.      This bug has zero security implications beyond the ability to cause a
  6.      program hitting this bug to exit immediately with a segfault.
  7.      See : http://www.mega-nerd.com/erikd/Blog/2009/Feb/14/index.html
  8. -    Thanks to David Cournapeau and Lev Givon for the bug report.
  9. +    Thanks to David Cournapeau for the bug report.
  10.  
  11.      * doc/win32.html Makefile.am configure.ac
  12.      Reinstate Win32/MSVC compile instructions.
  13. diff -urpN T1/libsamplerate-0.1.7/Win32/config.h T2/libsamplerate-0.1.7/Win32/config.h
  14. --- T1/libsamplerate-0.1.7/Win32/config.h   2009-02-14 04:46:40.000000000 -0700
  15. +++ T2/libsamplerate-0.1.7/Win32/config.h   2009-02-14 04:42:49.000000000 -0700
  16. @@ -190,7 +190,8 @@
  17.  #define STDC_HEADERS 1
  18.  
  19.  /* Version number of package */
  20. -#define VERSION "0.1.7"
  21. +<<<<<<< diff from left file
  22. +#define VERSION "0.1.4"
  23.  
  24.  
  25.  
  26. @@ -202,3 +203,6 @@
  27.  */
  28.  
  29.  #define inline __inline
  30. +========
  31. +#define VERSION "0.1.7"
  32. +>>>>>>> diff from right file
  33. trini@bill-the-cat:~/work/tmp/oe-core-template$ diff -urpN T1 T2  less
  34. diff: extra operand `less'
  35. diff: Try `diff --help' for more information.
  36. trini@bill-the-cat:~/work/tmp/oe-core-template$ diff -urpN T1 T2 | less
  37. trini@bill-the-cat:~/work/tmp/oe-core-template$ diff -urpN T1 T2
  38. diff -urpN T1/libsamplerate-0.1.7/ChangeLog T2/libsamplerate-0.1.7/ChangeLog
  39. --- T1/libsamplerate-0.1.7/ChangeLog    2009-02-14 17:17:35.000000000 -0700
  40. +++ T2/libsamplerate-0.1.7/ChangeLog    2009-02-14 04:37:27.000000000 -0700
  41. @@ -11,7 +11,7 @@
  42.      This bug has zero security implications beyond the ability to cause a
  43.      program hitting this bug to exit immediately with a segfault.
  44.      See : http://www.mega-nerd.com/erikd/Blog/2009/Feb/14/index.html
  45. -    Thanks to David Cournapeau and Lev Givon for the bug report.
  46. +    Thanks to David Cournapeau for the bug report.
  47.  
  48.      * doc/win32.html Makefile.am configure.ac
  49.      Reinstate Win32/MSVC compile instructions.
  50. diff -urpN T1/libsamplerate-0.1.7/Win32/config.h T2/libsamplerate-0.1.7/Win32/config.h
  51. --- T1/libsamplerate-0.1.7/Win32/config.h   2009-02-14 04:46:40.000000000 -0700
  52. +++ T2/libsamplerate-0.1.7/Win32/config.h   2009-02-14 04:42:49.000000000 -0700
  53. @@ -190,7 +190,8 @@
  54.  #define STDC_HEADERS 1
  55.  
  56.  /* Version number of package */
  57. -#define VERSION "0.1.7"
  58. +<<<<<<< diff from left file
  59. +#define VERSION "0.1.4"
  60.  
  61.  
  62.  
  63. @@ -202,3 +203,6 @@
  64.  */
  65.  
  66.  #define inline __inline
  67. +========
  68. +#define VERSION "0.1.7"
  69. +>>>>>>> diff from right file
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!