[X2Go-Commits] [nx-libs] 32/45: Merge branch 'sunweaver-pr/xbitmaps-cleanup' into arctica-3.6.x

[git-admin at x2go.org]

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

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 2b159e18dda7475db1867d3981ad0905f7531dbe
Merge: 825af18 e69b7d1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Apr 23 13:29:10 2015 +0200

    Merge branch 'sunweaver-pr/xbitmaps-cleanup' into arctica-3.6.x
    
    Attributes GH PR #16: https://github.com/ArcticaProject/nx-libs/pull/16

 Makefile                            |    6 +-
 debian/rules                        |    1 -
 nx-X11/include/Imakefile            |    2 +-
 nx-X11/include/bitmaps/1x1          |    6 -
 nx-X11/include/bitmaps/2x2          |    6 -
 nx-X11/include/bitmaps/Imakefile    |   86 ---
 nx-X11/include/bitmaps/black        |    6 -
 nx-X11/include/bitmaps/boxes        |    6 -
 nx-X11/include/bitmaps/calculator   |   19 -
 nx-X11/include/bitmaps/cntr_ptr     |    8 -
 nx-X11/include/bitmaps/cntr_ptrmsk  |    6 -
 nx-X11/include/bitmaps/cross_weave  |    6 -
 nx-X11/include/bitmaps/dimple1      |    6 -
 nx-X11/include/bitmaps/dimple3      |    6 -
 nx-X11/include/bitmaps/dot          |    6 -
 nx-X11/include/bitmaps/dropbar7     |    4 -
 nx-X11/include/bitmaps/dropbar8     |    4 -
 nx-X11/include/bitmaps/escherknot   |  473 ---------------
 nx-X11/include/bitmaps/flagdown     |   27 -
 nx-X11/include/bitmaps/flagup       |   27 -
 nx-X11/include/bitmaps/flipped_gray |    4 -
 nx-X11/include/bitmaps/gray         |    4 -
 nx-X11/include/bitmaps/gray1        |    4 -
 nx-X11/include/bitmaps/gray3        |    4 -
 nx-X11/include/bitmaps/grid16       |    6 -
 nx-X11/include/bitmaps/grid2        |    4 -
 nx-X11/include/bitmaps/grid4        |    4 -
 nx-X11/include/bitmaps/grid8        |    4 -
 nx-X11/include/bitmaps/hlines2      |    4 -
 nx-X11/include/bitmaps/hlines3      |    4 -
 nx-X11/include/bitmaps/icon         |    6 -
 nx-X11/include/bitmaps/keyboard16   |    6 -
 nx-X11/include/bitmaps/left_ptr     |    8 -
 nx-X11/include/bitmaps/left_ptrmsk  |    6 -
 nx-X11/include/bitmaps/letters      |   27 -
 nx-X11/include/bitmaps/light_gray   |    4 -
 nx-X11/include/bitmaps/mailempty    |   27 -
 nx-X11/include/bitmaps/mailemptymsk |   27 -
 nx-X11/include/bitmaps/mailfull     |   27 -
 nx-X11/include/bitmaps/mailfullmsk  |   27 -
 nx-X11/include/bitmaps/mensetmanus  |  258 --------
 nx-X11/include/bitmaps/menu10       |    5 -
 nx-X11/include/bitmaps/menu12       |    5 -
 nx-X11/include/bitmaps/menu16       |    6 -
 nx-X11/include/bitmaps/menu6        |    4 -
 nx-X11/include/bitmaps/menu8        |    4 -
 nx-X11/include/bitmaps/noletters    |   27 -
 nx-X11/include/bitmaps/opendot      |    8 -
 nx-X11/include/bitmaps/opendotMask  |    8 -
 nx-X11/include/bitmaps/plaid        |   11 -
 nx-X11/include/bitmaps/right_ptr    |    8 -
 nx-X11/include/bitmaps/right_ptrmsk |    6 -
 nx-X11/include/bitmaps/root_weave   |    4 -
 nx-X11/include/bitmaps/scales       |    6 -
 nx-X11/include/bitmaps/sipb         |   16 -
 nx-X11/include/bitmaps/star         |    8 -
 nx-X11/include/bitmaps/starMask     |    8 -
 nx-X11/include/bitmaps/stipple      |    4 -
 nx-X11/include/bitmaps/target       |    6 -
 nx-X11/include/bitmaps/terminal     |   52 --
 nx-X11/include/bitmaps/tie_fighter  |    6 -
 nx-X11/include/bitmaps/vlines2      |    4 -
 nx-X11/include/bitmaps/vlines3      |    4 -
 nx-X11/include/bitmaps/weird_size   |    5 -
 nx-X11/include/bitmaps/wide_weave   |    6 -
 nx-X11/include/bitmaps/wingdogs     |   14 -
 nx-X11/include/bitmaps/woman        |   66 ---
 nx-X11/include/bitmaps/xfd_icon     |   27 -
 nx-X11/include/bitmaps/xlogo11      |    6 -
 nx-X11/include/bitmaps/xlogo16      |    6 -
 nx-X11/include/bitmaps/xlogo32      |   14 -
 nx-X11/include/bitmaps/xlogo64      |   46 --
 nx-X11/include/bitmaps/xsnow        | 1112 -----------------------------------
 nx-libs.spec                        |    1 -
 74 files changed, 2 insertions(+), 2687 deletions(-)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git