[petsc] 02/06: Merge branch 'upstream'

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository petsc.

commit c56d3a9d1cb47b7759410bf582102b107f4e3c7e
Merge: 3a5ed53 01bd817
Author: Drew Parsons <dparsons at emerall.com>
Date:   Wed Mar 30 20:17:39 2016 +0800

    Merge branch 'upstream'

 systems/Apple/OSX/bin/arch-osx-debug.py            |   19 -
 systems/Apple/OSX/bin/arch-osx-release.py          |   20 -
 systems/Apple/OSX/bin/makeall                      |   35 -
 systems/Apple/OSX/bin/makedmg                      |   62 -
 systems/Apple/OSX/bin/makedocs                     |  162 -
 systems/Apple/OSX/bin/makeframework                |   92 -
 .../PETSc cocoa example.xcodeproj/project.pbxproj  |  309 --
 .../PETSc cocoa example/AppDelegate.h              |   15 -
 .../PETSc cocoa example/AppDelegate.m              |   58 -
 .../PETSc cocoa example-Info.plist                 |   34 -
 .../PETSc cocoa example-Prefix.pch                 |    7 -
 .../PETSc cocoa example/en.lproj/Credits.rtf       |   29 -
 .../PETSc cocoa example/en.lproj/InfoPlist.strings |    2 -
 .../PETSc cocoa example/en.lproj/MainMenu.xib      | 4666 --------------------
 .../PETSc cocoa example/PETSc cocoa example/main.m |   14 -
 .../project.pbxproj                                |  216 -
 .../PETSc_command_line_example.1                   |   79 -
 .../PETSc command line example/main.c              |   11 -
 .../iOS/PETSc/PETSc.xcodeproj/project.pbxproj      | 2992 -------------
 systems/Apple/iOS/bin/arch-ios-simulator.py        |   26 -
 systems/Apple/iOS/bin/iosbuilder.py                |  315 --
 systems/Apple/iOS/bin/makeall                      |   28 -
 systems/Apple/iOS/bin/makedmg                      |   67 -
 systems/Apple/iOS/bin/makedocs                     |  162 -
 systems/Apple/iOS/bin/makeframework                |   89 -
 .../iOS/examples/Basic/Classes/iphoneAppDelegate.h |   22 -
 .../iOS/examples/Basic/Classes/iphoneAppDelegate.m |   39 -
 .../examples/Basic/Classes/iphoneViewController.h  |   21 -
 .../examples/Basic/Classes/iphoneViewController.m  |  131 -
 .../Apple/iOS/examples/Basic/Default-568h at 2x.png   |  Bin 18594 -> 0 bytes
 systems/Apple/iOS/examples/Basic/MainWindow.xib    |  227 -
 .../Apple/iOS/examples/Basic/examples-Info.plist   |   30 -
 .../Basic/examples.xcodeproj/barrysmith.mode1v3    | 1418 ------
 .../Basic/examples.xcodeproj/barrysmith.pbxuser    |  498 ---
 .../Basic/examples.xcodeproj/project.pbxproj       |  305 --
 .../Apple/iOS/examples/Basic/examples_Prefix.pch   |    8 -
 .../iOS/examples/Basic/iphoneViewController.xib    |  495 ---
 systems/Apple/iOS/examples/Basic/main.m            |   17 -
 .../SwiftExample/SwiftExample/AppDelegate.swift    |   64 -
 .../SwiftExample/Base.lproj/LaunchScreen.xib       |   41 -
 .../SwiftExample/Base.lproj/Main.storyboard        |   48 -
 .../examples/SwiftExample/SwiftExample/Info.plist  |   47 -
 .../SwiftExample/SwiftExample/ViewController.swift |   29 -
 .../testopengl/Classes/iphoneAppDelegate.h         |   22 -
 .../testopengl/Classes/iphoneAppDelegate.m         |   39 -
 .../testopengl/Classes/iphoneViewController.h      |   25 -
 .../testopengl/Classes/iphoneViewController.m      |  189 -
 .../Apple/iOS/examples/testopengl/MainWindow.xib   |  227 -
 .../iOS/examples/testopengl/examples-Info.plist    |   30 -
 .../testopengl/examples.xcodeproj/project.pbxproj  |  309 --
 .../iOS/examples/testopengl/examples_Prefix.pch    |    8 -
 .../examples/testopengl/iphoneViewController.xib   |  358 --
 systems/Apple/iOS/examples/testopengl/main.m       |   44 -
 53 files changed, 14200 deletions(-)

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