diff -Npru /Users/josh/Desktop/libsamplerate-0.1.7-old/ChangeLog /Users/josh/Desktop/libsamplerate-0.1.7-new/ChangeLog
old
|
new
|
|
11 | 11 | This bug has zero security implications beyond the ability to cause a |
12 | 12 | program hitting this bug to exit immediately with a segfault. |
13 | 13 | See : http://www.mega-nerd.com/erikd/Blog/2009/Feb/14/index.html |
14 | | Thanks to David Cournapeau for the bug report. |
| 14 | Thanks to David Cournapeau and Lev Givon for the bug report. |
15 | 15 | |
16 | 16 | * doc/win32.html Makefile.am configure.ac |
17 | 17 | Reinstate Win32/MSVC compile instructions. |
diff -Npru /Users/josh/Desktop/libsamplerate-0.1.7-old/Win32/config.h /Users/josh/Desktop/libsamplerate-0.1.7-new/Win32/config.h
old
|
new
|
|
190 | 190 | #define STDC_HEADERS 1 |
191 | 191 | |
192 | 192 | /* Version number of package */ |
193 | | <<<<<<< diff from left file |
194 | | #define VERSION "0.1.4" |
| 193 | #define VERSION "0.1.7" |
195 | 194 | |
196 | 195 | |
197 | 196 | |
… |
… |
|
203 | 202 | */ |
204 | 203 | |
205 | 204 | #define inline __inline |
206 | | ======== |
207 | | #define VERSION "0.1.7" |
208 | | >>>>>>> diff from right file |