[sikuli] 06/08: Merge branch 'upstream'

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository sikuli.

commit c56ef12b62ebb5eafd662f6e18e10cb1e0844db4
Merge: e68173c 84009f4
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Oct 25 17:26:06 2014 +0200

    Merge branch 'upstream'

 API/src/main/resources/Lib/xlrd/__init__.py        |  461 ----
 API/src/main/resources/Lib/xlrd/biffh.py           |  663 -----
 API/src/main/resources/Lib/xlrd/book.py            | 1420 ----------
 API/src/main/resources/Lib/xlrd/compdoc.py         |  473 ----
 API/src/main/resources/Lib/xlrd/formatting.py      | 1262 ---------
 API/src/main/resources/Lib/xlrd/formula.py         | 2179 ---------------
 API/src/main/resources/Lib/xlrd/info.py            |    1 -
 API/src/main/resources/Lib/xlrd/licences.py        |   77 -
 API/src/main/resources/Lib/xlrd/sheet.py           | 2419 ----------------
 API/src/main/resources/Lib/xlrd/timemachine.py     |   52 -
 API/src/main/resources/Lib/xlrd/xldate.py          |  213 --
 API/src/main/resources/Lib/xlrd/xlsx.py            |  801 ------
 API/src/main/resources/Lib/xlutils/__init__.py     |    5 -
 API/src/main/resources/Lib/xlutils/copy.py         |   21 -
 API/src/main/resources/Lib/xlutils/display.py      |   40 -
 API/src/main/resources/Lib/xlutils/filter.py       |  937 -------
 API/src/main/resources/Lib/xlutils/license.txt     |   21 -
 API/src/main/resources/Lib/xlutils/margins.py      |  183 --
 API/src/main/resources/Lib/xlutils/save.py         |   25 -
 API/src/main/resources/Lib/xlutils/styles.py       |   42 -
 API/src/main/resources/Lib/xlutils/version.txt     |    1 -
 API/src/main/resources/Lib/xlutils/view.py         |  152 --
 API/src/main/resources/Lib/xlwt/BIFFRecords.py     | 2461 -----------------
 API/src/main/resources/Lib/xlwt/Bitmap.py          |  262 --
 API/src/main/resources/Lib/xlwt/Cell.py            |  243 --
 API/src/main/resources/Lib/xlwt/Column.py          |   49 -
 API/src/main/resources/Lib/xlwt/CompoundDoc.py     |  282 --
 API/src/main/resources/Lib/xlwt/ExcelFormula.py    |   43 -
 .../main/resources/Lib/xlwt/ExcelFormulaLexer.py   |  126 -
 .../main/resources/Lib/xlwt/ExcelFormulaParser.py  |  675 -----
 API/src/main/resources/Lib/xlwt/ExcelMagic.py      |  862 ------
 API/src/main/resources/Lib/xlwt/Formatting.py      |  261 --
 API/src/main/resources/Lib/xlwt/Row.py             |  298 --
 API/src/main/resources/Lib/xlwt/Style.py           |  712 -----
 API/src/main/resources/Lib/xlwt/UnicodeUtils.py    |  122 -
 API/src/main/resources/Lib/xlwt/Utils.py           |  166 --
 API/src/main/resources/Lib/xlwt/Workbook.py        |  664 -----
 API/src/main/resources/Lib/xlwt/Worksheet.py       | 1356 ---------
 API/src/main/resources/Lib/xlwt/__init__.py        |    9 -
 API/src/main/resources/Lib/xlwt/antlr.py           | 2874 --------------------
 API/src/main/resources/Lib/xlwt/excel-formula.g    |  374 ---
 41 files changed, 23287 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git