[med-svn] [hyphy] 03/03: Merge tag 'upstream/2.2.4+dfsg'

Andreas Tille tille at debian.org
Fri Jul 10 10:34:37 UTC 2015


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

tille pushed a commit to branch master
in repository hyphy.

commit d48d9888430e0988efd61aaa3d4b0f52e5e1eaa3
Merge: 9357830 248b8de
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 10 12:11:44 2015 +0200

    Merge tag 'upstream/2.2.4+dfsg'
    
    Upstream version 2.2.4+dfsg

 src/gui/mac/Components/HYPlatformButton.cpp        |    1 -
 src/gui/mac/Components/HYPlatformButtonBar.cpp     |    1 -
 src/gui/mac/Components/HYPlatformCheckBox.cpp      |    1 -
 src/gui/mac/Components/HYPlatformLabel.cpp         |    1 -
 src/gui/mac/Components/HYPlatformList.cpp          |    1 -
 src/gui/mac/Components/HYPlatformPullDown.cpp      |    1 -
 src/gui/mac/Components/HYPlatformSequencePane.cpp  |    1 -
 src/gui/mac/Components/HYPlatformTable.cpp         |    1 -
 src/gui/mac/Components/HYPlatformTextBox.cpp       | 1241 --------------
 src/gui/mac/Docs.icns                              |  Bin 169303 -> 0 bytes
 src/gui/mac/HYPHY.icns                             |  Bin 169303 -> 0 bytes
 src/gui/mac/HYPHYMP.icns                           |  Bin 169303 -> 0 bytes
 src/gui/mac/HYPlatformComponent.cpp                |    1 -
 src/gui/mac/HYPlatformGraphicPane.cpp              |  607 -------
 src/gui/mac/HYPlatformUtils.cpp                    |    1 -
 src/gui/mac/HYPlatformWindow.cpp                   | 1118 ------------
 src/gui/mac/HyPhy.rsrc                             |  Bin 388670 -> 0 bytes
 src/gui/mac/Info.plist                             |   58 -
 .../mac/WindowClasses/HYPlatformBootsrapWindow.cpp |    1 -
 .../mac/WindowClasses/HYPlatformChartWindow.cpp    |    1 -
 .../mac/WindowClasses/HYPlatformConsoleWindow.cpp  |  394 -----
 src/gui/mac/WindowClasses/HYPlatformDBWindow.cpp   |    1 -
 src/gui/mac/WindowClasses/HYPlatformDataPanel.cpp  | 1100 ------------
 src/gui/mac/WindowClasses/HYPlatformGWindow.cpp    |    1 -
 .../mac/WindowClasses/HYPlatformModelWindow.cpp    |    1 -
 src/gui/mac/WindowClasses/HYPlatformPWindow.cpp    |    1 -
 .../mac/WindowClasses/HYPlatformParameterTable.cpp |    1 -
 src/gui/mac/WindowClasses/HYPlatformTWindow.cpp    |    1 -
 src/gui/mac/WindowClasses/HYPlatformTreePanel.cpp  |    1 -
 src/gui/mac/hydialogs.cpp                          |  774 ---------
 src/gui/mac/iHyPhyDebug.rsrc                       |  Bin 388670 -> 0 bytes
 src/gui/mac/include/Components/HYPlatformButton.h  |   92 -
 .../mac/include/Components/HYPlatformButtonBar.h   |  118 --
 .../mac/include/Components/HYPlatformCheckbox.h    |   78 -
 src/gui/mac/include/Components/HYPlatformLabel.h   |   88 -
 src/gui/mac/include/Components/HYPlatformList.h    |   94 --
 .../mac/include/Components/HYPlatformPullDown.h    |  120 --
 src/gui/mac/include/Components/HYPlatformTable.h   |  112 --
 src/gui/mac/include/Components/HYPlatformTextbox.h |  152 --
 src/gui/mac/include/HYPlatformButtonMenu.h         |  196 ---
 src/gui/mac/include/HYPlatformComponent.h          |   77 -
 src/gui/mac/include/HYPlatformGraphicPane.h        |   90 -
 src/gui/mac/include/HYPlatformWindow.h             |  160 --
 src/gui/mac/plist.r                                |    3 -
 src/gui/mac/plist.xml                              |   36 -
 src/gui/mac/plistmp.r                              |    1 -
 src/gui/res/Windows/128.cur                        |  Bin 2238 -> 0 bytes
 src/gui/res/Windows/129.cur                        |  Bin 2238 -> 0 bytes
 src/gui/res/Windows/130.bmp                        |  Bin 12342 -> 0 bytes
 src/gui/res/Windows/131.bmp                        |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/132.bmp                        |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/132.cur                        |  Bin 2238 -> 0 bytes
 src/gui/res/Windows/133.bmp                        |  Bin 11958 -> 0 bytes
 src/gui/res/Windows/3000.bmp                       |  Bin 1110 -> 0 bytes
 src/gui/res/Windows/333.bmp                        |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/400.bmp                        |  Bin 38454 -> 0 bytes
 src/gui/res/Windows/4000.bmp                       |  Bin 1224 -> 0 bytes
 src/gui/res/Windows/4001.bmp                       |  Bin 1222 -> 0 bytes
 src/gui/res/Windows/4002.bmp                       |  Bin 1222 -> 0 bytes
 src/gui/res/Windows/4003.bmp                       |  Bin 1222 -> 0 bytes
 src/gui/res/Windows/401.bmp                        |  Bin 38454 -> 0 bytes
 src/gui/res/Windows/4011.bmp                       |  Bin 1286 -> 0 bytes
 src/gui/res/Windows/402.bmp                        |  Bin 38454 -> 0 bytes
 src/gui/res/Windows/4020.bmp                       |  Bin 1222 -> 0 bytes
 src/gui/res/Windows/5000.bmp                       |  Bin 1466 -> 0 bytes
 src/gui/res/Windows/5001.bmp                       |  Bin 1478 -> 0 bytes
 src/gui/res/Windows/5002.bmp                       |  Bin 1466 -> 0 bytes
 src/gui/res/Windows/5003.bmp                       |  Bin 1478 -> 0 bytes
 src/gui/res/Windows/5004.bmp                       |  Bin 1464 -> 0 bytes
 src/gui/res/Windows/5005.bmp                       |  Bin 1432 -> 0 bytes
 src/gui/res/Windows/5006.bmp                       |  Bin 1314 -> 0 bytes
 src/gui/res/Windows/5007.bmp                       |  Bin 1464 -> 0 bytes
 src/gui/res/Windows/6000.bmp                       |  Bin 1266 -> 0 bytes
 src/gui/res/Windows/6001.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/6002.bmp                       |  Bin 1178 -> 0 bytes
 src/gui/res/Windows/6003.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/6004.bmp                       |  Bin 1310 -> 0 bytes
 src/gui/res/Windows/6005.bmp                       |  Bin 1304 -> 0 bytes
 src/gui/res/Windows/6006.bmp                       |  Bin 1324 -> 0 bytes
 src/gui/res/Windows/6007.bmp                       |  Bin 1298 -> 0 bytes
 src/gui/res/Windows/6008.bmp                       |  Bin 1312 -> 0 bytes
 src/gui/res/Windows/6009.bmp                       |  Bin 1246 -> 0 bytes
 src/gui/res/Windows/6010.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/6011.bmp                       |  Bin 1308 -> 0 bytes
 src/gui/res/Windows/6012.bmp                       |  Bin 1226 -> 0 bytes
 src/gui/res/Windows/6013.bmp                       |  Bin 246 -> 0 bytes
 src/gui/res/Windows/6014.bmp                       |  Bin 246 -> 0 bytes
 src/gui/res/Windows/6016.bmp                       |  Bin 1336 -> 0 bytes
 src/gui/res/Windows/6017.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/6018.bmp                       |  Bin 1258 -> 0 bytes
 src/gui/res/Windows/6019.bmp                       |  Bin 1314 -> 0 bytes
 src/gui/res/Windows/6020.bmp                       |  Bin 1294 -> 0 bytes
 src/gui/res/Windows/6021.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/6022.bmp                       |  Bin 1314 -> 0 bytes
 src/gui/res/Windows/6030.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/6031.bmp                       |  Bin 1260 -> 0 bytes
 src/gui/res/Windows/6032.bmp                       |  Bin 1318 -> 0 bytes
 src/gui/res/Windows/6033.bmp                       |  Bin 1330 -> 0 bytes
 src/gui/res/Windows/6034.bmp                       |  Bin 1318 -> 0 bytes
 src/gui/res/Windows/6035.bmp                       |  Bin 1314 -> 0 bytes
 src/gui/res/Windows/6036.bmp                       |  Bin 1282 -> 0 bytes
 src/gui/res/Windows/6040.bmp                       |  Bin 1282 -> 0 bytes
 src/gui/res/Windows/6041.bmp                       |  Bin 1316 -> 0 bytes
 src/gui/res/Windows/6042.bmp                       |  Bin 1226 -> 0 bytes
 src/gui/res/Windows/7000.bmp                       |  Bin 1326 -> 0 bytes
 src/gui/res/Windows/7001.bmp                       |  Bin 1308 -> 0 bytes
 src/gui/res/Windows/7002.bmp                       |  Bin 1296 -> 0 bytes
 src/gui/res/Windows/7003.bmp                       |  Bin 1286 -> 0 bytes
 src/gui/res/Windows/7004.bmp                       |  Bin 1294 -> 0 bytes
 src/gui/res/Windows/7005.bmp                       |  Bin 1300 -> 0 bytes
 src/gui/res/Windows/7010.bmp                       |  Bin 1270 -> 0 bytes
 src/gui/res/Windows/7011.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/7012.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/7013.bmp                       |  Bin 1258 -> 0 bytes
 src/gui/res/Windows/7014.bmp                       |  Bin 1246 -> 0 bytes
 src/gui/res/Windows/7020.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/7050.bmp                       |  Bin 1334 -> 0 bytes
 src/gui/res/Windows/Win.rc                         |    1 -
 src/gui/res/Windows/desk.ico                       |  Bin 204862 -> 0 bytes
 src/gui/res/Windows/hyphy.bmp                      |  Bin 91880 -> 0 bytes
 src/gui/res/Windows/pthreadGC2.dll                 |  Bin 69088 -> 0 bytes
 src/gui/res/Windows/pthreadVC2.dll                 |  Bin 86070 -> 0 bytes
 src/gui/win/Components/HYPlatformButton.cpp        |    1 -
 src/gui/win/Components/HYPlatformButtonBar.cpp     |    1 -
 src/gui/win/Components/HYPlatformCheckBox.cpp      |    1 -
 src/gui/win/Components/HYPlatformLabel.cpp         |    1 -
 src/gui/win/Components/HYPlatformPullDown.cpp      |    1 -
 src/gui/win/Components/HYPlatformSequencePane.cpp  |  249 ---
 src/gui/win/Components/HYPlatformTable.cpp         | 1771 --------------------
 src/gui/win/Components/HYPlatformTextBox.cpp       |  740 --------
 src/gui/win/HYPlatformComponent.cpp                |  672 --------
 src/gui/win/HYPlatformGraphicPane.cpp              |    1 -
 src/gui/win/HYPlatformWindow.cpp                   |  863 ----------
 src/gui/win/HYPlatfromUtils.cpp                    |  773 ---------
 .../win/WindowClasses/HYPlatformBootsrapWindow.cpp |    1 -
 .../win/WindowClasses/HYPlatformChartWindow.cpp    |    1 -
 .../win/WindowClasses/HYPlatformConsoleWindow.cpp  |  584 -------
 src/gui/win/WindowClasses/HYPlatformDBWindow.cpp   |    1 -
 src/gui/win/WindowClasses/HYPlatformDataPanel.cpp  |    1 -
 src/gui/win/WindowClasses/HYPlatformGWindow.cpp    |    1 -
 .../win/WindowClasses/HYPlatformModelWindow.cpp    |    1 -
 src/gui/win/WindowClasses/HYPlatformPWindow.cpp    |    1 -
 .../win/WindowClasses/HYPlatformParameterTable.cpp |    1 -
 src/gui/win/WindowClasses/HYPlatformTWindow.cpp    |    1 -
 src/gui/win/WindowClasses/HYPlatformTreePanel.cpp  | 1328 ---------------
 src/gui/win/include/Components/HYPlatformButton.h  |    1 -
 .../win/include/Components/HYPlatformButtonBar.h   |    1 -
 .../win/include/Components/HYPlatformCheckbox.h    |    1 -
 src/gui/win/include/Components/HYPlatformLabel.h   |    1 -
 .../win/include/Components/HYPlatformPullDown.h    |    1 -
 src/gui/win/include/Components/HYPlatformTable.h   |    1 -
 src/gui/win/include/Components/HYPlatformTextbox.h |    1 -
 src/gui/win/include/HYPlatformButtonMenu.h         |    1 -
 src/gui/win/include/HYPlatformComponent.h          |    1 -
 src/gui/win/include/HYPlatformGraphicPane.h        |    1 -
 src/gui/win/include/HYPlatformWindow.h             |    1 -
 src/gui/win/include/pthread.h                      | 1363 ---------------
 src/gui/win/include/sched.h                        |  178 --
 src/gui/win/include/semaphore.h                    |  166 --
 159 files changed, 15442 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/hyphy.git



More information about the debian-med-commit mailing list