[hdf-compass] 28/295: merge with local changes

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository hdf-compass.

commit 9539f261cbe86121247abdc3d3f05e6d6672f786
Merge: 9b51693 72be77b
Author: John Readey <jreadey at hdfgroup.org>
Date:   Tue Jul 22 22:39:59 2014 -0700

    merge with local changes

 .gitignore                         |   5 +++++
 array_model/.DS_Store              | Bin 6148 -> 0 bytes
 compass_model/.DS_Store            | Bin 6148 -> 0 bytes
 compass_model/icons/.DS_Store      | Bin 6148 -> 0 bytes
 compass_viewer/.DS_Store           | Bin 15364 -> 0 bytes
 compass_viewer/array/.DS_Store     | Bin 6148 -> 0 bytes
 compass_viewer/container/.DS_Store | Bin 6148 -> 0 bytes
 compass_viewer/icons/.DS_Store     | Bin 6148 -> 0 bytes
 compass_viewer/image/.DS_Store     | Bin 6148 -> 0 bytes
 compass_viewer/keyvalue/.DS_Store  | Bin 6148 -> 0 bytes
 docs/.DS_Store                     | Bin 6148 -> 0 bytes
 filesystem_model/.DS_Store         | Bin 6148 -> 0 bytes
 hdf5_model/.DS_Store               | Bin 6148 -> 0 bytes
 13 files changed, 5 insertions(+)

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