[python-xrayutilities] 02/05: Merge tag 'upstream/1.1.2'

[Eugen Wintersberger]

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

eugenwintersberger-guest pushed a commit to branch master
in repository python-xrayutilities.

commit 837dd452b7c14883a911cfb44470750005f0a200
Merge: 55d1026 d70b227
Author: Eugen Wintersberger <eugen.wintersberger at gmail.com>
Date:   Sat Apr 25 13:02:18 2015 +0200

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2

 CHANGES.txt                                     |     9 +
 PKG-INFO                                        |    50 +-
 README.txt                                      |    41 +-
 doc/source/_static/favicon.ico                  |   Bin 2238 -> 4286 bytes
 doc/source/conf.py                              |    11 +-
 doc/source/examples.rst                         |   112 +-
 doc/source/index.rst                            |    84 +-
 doc/source/index.rst~                           |    82 +-
 doc/source/pics/favicon.ppm                     |     5 -
 doc/source/pics/xray-logo-sf.png                |   Bin 4406 -> 0 bytes
 doc/source/pics/xray-logo.png                   |   Bin 11534 -> 17068 bytes
 doc/source/pics/xu_usage.png                    |   Bin 27536 -> 25172 bytes
 doc/source/pics/xu_usage.svg                    |   569 +-
 doc/source/pics/xu_usage_inkscape.svg           |   414 +
 doc/source/pics/xu_usage_planning.png           |   Bin 20586 -> 17437 bytes
 doc/source/pics/xu_usage_planning.svg           |   457 +-
 doc/source/pics/xu_usage_planning_inkscape.svg  |   303 +
 examples/data/04-003-0996.cif                   |  8060 ------------
 examples/data/1216385.cif                       |   166 -
 examples/data/BaF2.cif                          |   456 +-
 examples/data/Calcite.cif                       |   144 +-
 examples/data/Silicon.cif                       |   454 +-
 examples/data/bi2te3.cif                        |   176 +-
 examples/xrayutilities_export_data2vtk.py       |   164 +-
 examples/xrayutilities_hotpixelkill_variant.py  |   132 +-
 examples/xrayutilities_kmap_example_ESRF.py     |   202 +-
 examples/xrayutilities_user.conf                |    18 +-
 setup.py                                        |    11 +-
 xrayutilities.pdf                               | 14147 +++++++++++-----------
 xrayutilities/analysis/sample_align.py          |    64 +-
 xrayutilities/experiment.py                     |    47 +-
 xrayutilities/gridder2d.py                      |     3 +-
 xrayutilities/io/__init__.py                    |     1 +
 xrayutilities/io/edf.py                         |    34 +-
 xrayutilities/io/fastscan.py                    |  1544 +--
 xrayutilities/io/helper.py                      |     5 +-
 xrayutilities/io/spec.py                        |    77 +-
 xrayutilities/materials/cif.py                  |     4 +-
 xrayutilities/materials/data/README.txt~        |    13 -
 xrayutilities/materials/material.py             |   177 +-
 xrayutilities/materials/predefined_materials.py |     4 +
 xrayutilities/math/fit.py                       |    31 +-
 xrayutilities/math/functions.py                 |     5 +-
 xrayutilities/src/qconversion.h~                |   131 -
 xrayutilities/utilities_noconf.py               |    70 +-
 xrayutilities/xrayutilities_default.conf        |     2 +-
 46 files changed, 10337 insertions(+), 18142 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-xrayutilities.git