diff options
| author | piernov <piernov@piernov.org> | 2012-02-19 19:16:11 +0100 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-02-19 19:16:11 +0100 |
| commit | 451c9c141abfa3cf87303b8f59973785aa10d5f8 (patch) | |
| tree | bf2f298a0f233974dbf4791d64d2480060a5030c /qscintilla/.footprint.i686 | |
| parent | 5461f982d013f5260b1cc5054712638404eef192 (diff) | |
| parent | 7691015c39bc91b92f40924b2b8d930a9e154a49 (diff) | |
| download | nutyx-extra-451c9c141abfa3cf87303b8f59973785aa10d5f8.tar.gz nutyx-extra-451c9c141abfa3cf87303b8f59973785aa10d5f8.tar.bz2 nutyx-extra-451c9c141abfa3cf87303b8f59973785aa10d5f8.tar.xz nutyx-extra-451c9c141abfa3cf87303b8f59973785aa10d5f8.zip | |
Merge http://kiao.no-ip.info/NuTyX/git/nutyx-extra
Diffstat (limited to 'qscintilla/.footprint.i686')
| -rw-r--r-- | qscintilla/.footprint.i686 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qscintilla/.footprint.i686 b/qscintilla/.footprint.i686 index 18d2b0d96..34cafeeb1 100644 --- a/qscintilla/.footprint.i686 +++ b/qscintilla/.footprint.i686 @@ -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/ |