diff options
Diffstat (limited to 'qscintilla/.footprint.x86_64')
| -rw-r--r-- | qscintilla/.footprint.x86_64 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qscintilla/.footprint.x86_64 b/qscintilla/.footprint.x86_64 index 18d2b0d96..34cafeeb1 100644 --- a/qscintilla/.footprint.x86_64 +++ b/qscintilla/.footprint.x86_64 @@ -49,10 +49,17 @@ drwxr-xr-x root/root usr/include/Qsci/ -rw-r--r-- root/root usr/include/Qsci/qscistyle.h -rw-r--r-- root/root usr/include/Qsci/qscistyledtext.h drwxr-xr-x root/root usr/lib/ +<<<<<<< HEAD lrwxrwxrwx root/root usr/lib/libqscintilla2.so -> libqscintilla2.so.8.0.0 lrwxrwxrwx root/root usr/lib/libqscintilla2.so.8 -> libqscintilla2.so.8.0.0 lrwxrwxrwx root/root usr/lib/libqscintilla2.so.8.0 -> libqscintilla2.so.8.0.0 -rwxr-xr-x root/root usr/lib/libqscintilla2.so.8.0.0 +======= +lrwxrwxrwx root/root usr/lib/libqscintilla2.so -> libqscintilla2.so.8.0.1 +lrwxrwxrwx root/root usr/lib/libqscintilla2.so.8 -> libqscintilla2.so.8.0.1 +lrwxrwxrwx root/root usr/lib/libqscintilla2.so.8.0 -> libqscintilla2.so.8.0.1 +-rwxr-xr-x root/root usr/lib/libqscintilla2.so.8.0.1 +>>>>>>> 7691015c39bc91b92f40924b2b8d930a9e154a49 drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/ |