Commit graph

2501 commits

Author SHA1 Message Date
Frederik Rietdijk 13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Frederik Rietdijk 7ebcd39a0f Merge commit '4c49205' into HEAD 2017-08-13 18:34:59 +02:00
Tim Steinbach 877d331765
vscode: 1.14.2 -> 1.15.0 2017-08-12 19:44:56 -04:00
Michael Weiss 7f139a2a6b android-studio-preview: 3.0.0.9 -> 3.0.0.10 2017-08-11 23:41:03 +02:00
Joachim F 72d3d2a773 Merge pull request #28102 from mdorman/emacs-updates
Semi-automated Emacs package updates
2017-08-11 12:38:43 +00:00
Domen Kožar 486e1c3c16 Merge pull request #27998 from davidak/macOS
replace "Mac OS X" and "OS X" with "macOS"
2017-08-11 13:01:36 +02:00
Tim Steinbach debbd82194 Merge pull request #28071 from karolchmist/idea-ultimate-2017.1.2
idea-ultimate: 2017.1.5 -> 2017.2.1
2017-08-10 14:49:14 -04:00
Tim Steinbach 3971bd892d Merge pull request #28110 from abnerlee/patch-2
correct the sha265 of typora after package update
2017-08-10 14:48:16 -04:00
Tim Steinbach 9dafe594be Merge pull request #28074 from NeQuissimus/atom_1_19_0
atom: 1.18.0 -> 1.19.0
2017-08-10 13:31:04 -04:00
AbnerLee 8d70d4066f correct the sha265 of typora after package update
The deb is updated just now without increase the version number..
2017-08-11 00:47:08 +08:00
Jens Binkert 6bcbf585ec Typora: 0.9.29 -> 0.9.31 2017-08-10 16:02:03 +02:00
Michael Alan Dorman b43888b973 melpa-packages: 2017-08-09
Removals:
 - aurora-config-mode: removed from melpa
2017-08-09 17:16:43 -04:00
Michael Alan Dorman d887748507 melpa-stable-packages: 2017-08-09
Removals:
 - aurora-config-mode: removed from melpa
 - fuel: repo moved, lost tags for stable version
2017-08-09 17:16:43 -04:00
Michael Alan Dorman 05bee41510 org-packages: 2017-08-09 2017-08-09 17:16:43 -04:00
Michael Alan Dorman bdcb21c466 elpa-packages: 2017-08-09 2017-08-09 17:16:43 -04:00
Michael Weiss 6225f1bf66 android-studio-preview: 3.0.0.8 -> 3.0.0.9
"Android Studio 3.0 Canary 9" -> "Android Studio 3.0 Beta 1"
2017-08-09 21:32:43 +02:00
Tim Steinbach bd27239c06
atom: 1.18.0 -> 1.19.0 2017-08-09 09:13:28 -04:00
Karol Chmist e8020e272d idea-ultimate: 2017.1.5 -> 2017.2.1 2017-08-09 13:48:35 +02:00
davidak 3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Tim Steinbach 731a08730f
atom: Add paxmark 2017-08-05 14:36:00 -04:00
Jiri Danek 305b3fed04 idea-community: 2017.2.0 -> 2017.2.1 2017-08-04 10:38:59 +02:00
mimadrid 09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Michael Weiss 87b215d5f7 android-studio-preview: 3.0.0.7 -> 3.0.0.8
This also contains some refactoring.
2017-08-02 02:12:11 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Joachim F 7be40dd899 Merge pull request #27836 from mdorman/emacs-updates
Semi-automated Emacs package updates
2017-08-01 20:39:45 +01:00
Daiderd Jordan ac56b8db4a
nano: remove darwin patch 2017-08-01 18:28:52 +02:00
Michael Alan Dorman 4a84b487fd melpa-packages: 2017-08-01
Removals:
 - anything-project: removed from melpa
 - chinese-pyim-basedict: renamed to pyim-basedict
 - chinese-pyim-greatdict: renamed to pyim-greatdict
 - elscreen-persist: removed from melpa
 - mic-paren: repository no longer exists
 - mpg123: removed from melpa
 - mwe-log-commands: repository no longer exists
 - revive: removed from melpa
 - sql-mssql: removed from melpa
2017-08-01 11:24:39 -04:00
Michael Alan Dorman 8be846ef7e melpa-stable-packages: 2017-08-01
Removals:
 - chinese-pyim-basedict: renamed to pyim-basedict
 - chinese-pyim-greatdict: renamed to pyim-greatdict
 - elscreen-persist: removed from melpa-stable
 - mic-paren: repository no longer exists
2017-08-01 11:24:39 -04:00
Michael Alan Dorman 4ea23a09d9 org-packages: 2017-08-01 2017-08-01 11:24:39 -04:00
Michael Alan Dorman 46c97397b7 elpa-packages: 2017-08-01 2017-08-01 11:24:39 -04:00
Frederik Rietdijk 740d76371e Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD 2017-07-31 09:12:15 +02:00
Michael Weiss ace11d11b2 android-studio: Fix the meta attributes 2017-07-30 20:40:04 +02:00
Frederik Rietdijk 20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Bjørn Forsman 1639429359 vim_configurable: add ".../after" plugin dirs to runtimepath
This fixes using e.g. CSApprox when installed with nix.
2017-07-29 14:34:13 +02:00
Frederik Rietdijk b2608b8910 Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-29 13:08:11 +02:00
Frank Lanitz 369fde13a3 Update Geany 1.30.1 -> 1.31 (#27735) 2017-07-29 11:43:45 +01:00
Franz Pletz b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Robert Helgesson 03f6edf750
eclipse-plugin-anyedittools: 2.6.0 -> 2.7.0 2017-07-27 22:57:14 +02:00
Joachim F 4350d73236 Merge pull request #27667 from mdorman/emacs-updates
Semi-automated Emacs package updates
2017-07-27 05:35:58 +01:00
Michael Weiss 40a568b395 android-studio-preview: 3.0.0.6 -> 3.0.0.7 2017-07-26 18:56:28 +02:00
Michael Alan Dorman 6fcb5b708e melpa-packages: 2017-07-25
Removals:
 - bbdb-android: removed from github
 - bbdb-china: removed from github
 - bbdb-handy: removed from github
 - chinese-remote-input: removed from github
 - easy-lentic: removed from github
 - sql-mssql: removed from github
2017-07-25 20:42:52 -04:00
Michael Alan Dorman e533918024 melpa-stable-packages: 2017-07-25 2017-07-25 20:42:51 -04:00
Michael Alan Dorman 187b67dd90 org-packages: 2017-07-25 2017-07-25 20:42:51 -04:00
Michael Alan Dorman 1ec964b327 elpa-packages: 2017-07-25 2017-07-25 20:42:51 -04:00
Frederik Rietdijk 29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
Winnie Quinn 6df05b401b vscode: 1.14.0 -> 1.14.2 2017-07-22 17:35:49 -04:00
Thomas Tuegel 6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv 2017-07-21 20:36:34 -05:00
Lancelot SIX 60091342d4
nano: 2.8.5 -> 2.8.6
See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00007.html
for release announcement
2017-07-21 17:02:31 +02:00
Jörg Thalheim 5638472756 clion: 2017.1.3 -> 2017.2 2017-07-20 13:59:03 +01:00
Jörg Thalheim 92366530d8 Merge pull request #27494 from jdanekrh/jd_idea-community
idea-community: 2017.1.5 -> 2017.2
2017-07-19 23:23:40 +01:00
Tom Smeets becf96b2ca android-studio-preview: 3.0.0.5 -> 3.0.0.6 2017-07-19 18:26:19 +02:00
Jiri Danek 22644615e3 idea-community: 2017.1.5 -> 2017.2 2017-07-19 12:02:40 +02:00
Jörg Thalheim b2caceced3 Merge pull request #27354 from TomSmeets/androidstudio-3.0
android-studio-preview: init at 3.0.0.5 canary 6
2017-07-19 00:39:10 +01:00
Daniel Peebles bd2e91e3a2 Merge pull request #27318 from copumpkin/darwin-high-sierra
Support High Sierra on Darwin
2017-07-18 17:06:06 -04:00
Robert Helgesson 8dccc9b699
eclipse-plugin-checkstyle: 7.3.0 -> 8.0.0 2017-07-18 20:20:49 +02:00
Michael Alan Dorman 58b269f959 melpa-packages: 2017-07-17 2017-07-17 12:09:33 -04:00
Michael Alan Dorman b8213ab38f melpa-stable-packages: 2017-07-17 2017-07-17 12:09:31 -04:00
Michael Alan Dorman 5a48826ea4 org-packages: 2017-07-17 2017-07-17 12:09:28 -04:00
Michael Alan Dorman 960978fb68 elpa-packages: 2017-07-17 2017-07-17 12:09:26 -04:00
Benno Fünfstück e6fdfbb8dd jetbrains.rider: 171.4456.575 -> 171.4456.1432 2017-07-16 16:53:26 +02:00
Benno Fünfstück 0c78b20194 jetbrains.ruby-mine: 2017.1.4 -> 2017.1.5 2017-07-16 16:53:26 +02:00
Benno Fünfstück 37daf755d9 jetbrains.pycharm-{community,professional}: 2017.1.4 -> 2017.1.5 2017-07-16 16:53:26 +02:00
Benno Fünfstück 141706567c jetbrains.idea-community: 2017.1.4 -> 2017.1.5 2017-07-16 16:53:26 +02:00
Urban Škudnik 9ce8aadf5a jetbrains.idea-ultimate: 2017.1.4 -> 2017.1.5 2017-07-16 16:53:26 +02:00
Benno Fünfstück bf6ebda141 Merge pull request #25772 from jbaum98/neovim-ruby
neovim: neovim-ruby 0.3.1 -> 0.4.0
2017-07-15 19:03:46 +02:00
Benno Fünfstück 549df83e8e neovim-ruby: 0.4.0 -> 0.5.0 2017-07-15 18:56:51 +02:00
Tom Smeets 9ab69a3416 android-studio-preview: init at 3.0.0.5 canary 6
Added the `androidStudioPackages` attribute containing both
the `stable` and `preview` channels.
Changed the attribute `andorid-studio` to point to
  `androidStudioPackages.stable`
Added the attribute `andorid-studio-preview` pointing to
  `androidStudioPackages.preview`

I have tested this package using the new koltin support,
no issues found yet.
2017-07-13 11:38:05 +02:00
Vincent Laporte ff965a59f5 scite: 3.7.3 -> 3.7.5 2017-07-12 22:11:36 +02:00
Gabriel Ebner 71e44b1453 vscode: 1.13.0 -> 1.14.0 2017-07-12 17:23:39 +01:00
Dan Peebles 0419452113 Fix Darwin stdenv to work on 10.13
The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.
2017-07-11 21:56:38 -04:00
Matt McHenry c3d036df71
eclipse-modeling: 4.6 -> 4.7 2017-07-10 11:45:29 +02:00
Matt McHenry cd7a01d56e
eclipse-cpp: 4.6.0 -> 4.7.0 2017-07-10 11:45:24 +02:00
Victor Calvert 3ff40547f0 leo-editor: Don't hardcode pythonX.Ym 2017-07-06 18:42:38 -04:00
Michael Alan Dorman 49da250e9c melpa-packages: 2017-07-06
Removals:
 - gregorio-mode: repo no longer exists
2017-07-06 11:15:36 -04:00
Michael Alan Dorman 45d772288e melpa-stable-packages: 2017-07-06 2017-07-06 11:15:36 -04:00
Michael Alan Dorman 47bd753787 org-packages: 2017-07-06 2017-07-06 11:15:33 -04:00
Michael Alan Dorman 54f2ded821 elpa-packages: 2017-07-06 2017-07-06 11:15:30 -04:00
Vladimír Čunát 5328aac7be
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497
2017-07-05 08:55:26 +02:00
Frederik Rietdijk 43ca91106d kdevplatform: fix build 2017-07-03 10:10:17 +02:00
Vladimír Čunát ddf864f8aa
Merge branch 'master' into staging
Mass rebuilds from master (>7k on x86_64-linux).
2017-06-30 18:16:58 +02:00
John Ericson 95c8277701 misc pkgs: Remove unneeded *Platform == *Platform comparisons
PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.
2017-06-30 10:09:31 -04:00
Joachim F 332486fc13 Merge pull request #26943 from mdorman/emacs-updates
Automated Emacs Package updates
2017-06-29 07:04:01 +01:00
John Ericson 16be434b0b Merge accepted cross compilation PRs into staging 2017-06-28 23:17:21 -04:00
John Ericson e1faeb574a Merge pull request #26884 from obsidiansystems/purge-stdenv-cross
Purge stdenv cross
2017-06-28 21:39:16 -04:00
Michael Alan Dorman 37f381a970 melpa-packages: 2017-06-28
Removals:
 - relative-line-numbers: removed from melpa
2017-06-28 18:37:31 -04:00
Michael Alan Dorman b2e148faa0 melpa-stable-packages: 2017-06-28
Removals:
 - relative-line-numbers: removed from melpa
2017-06-28 18:37:30 -04:00
Michael Alan Dorman e636454c40 elpa-packages: 2017-06-28 2017-06-28 18:37:30 -04:00
John Ericson aac32fe2d1 vim: cc-wrapper can be relied on to export this env var 2017-06-28 18:31:37 -04:00
Robert Helgesson fa6e946383
eclipse-plugin-jdt: 4.6.2 -> 4.7 2017-06-28 20:56:48 +02:00
Robert Helgesson 556a867186
eclipse-sdk: 4.6.2 -> 4.7 2017-06-28 20:56:48 +02:00
Robert Helgesson 0a52cc1851
eclipse-platform: 4.6.2 -> 4.7 2017-06-28 20:56:43 +02:00
Frederik Rietdijk 8a62a9b064 Merge pull request #26125 from volth/webkitgtk-naming
rename webkitgtk24x⇒webkitgtk24x-gtk3; webkitgtk2⇒webkitgtk24x-gtk2
2017-06-28 13:54:38 +02:00
Jörg Thalheim ce88027294 jetbrains.gogland: 171.4694.35 -> 171.4694.61 2017-06-28 08:31:08 +01:00
Jörg Thalheim f849eb2018 jetbrains.datagrip: 2017.1.4 -> 2017.1.5 2017-06-28 08:30:59 +01:00
Lancelot SIX 1b792b4edf
nano: 2.8.4 -> 2.8.5
See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00012.html
for release information.
2017-06-26 11:01:55 +02:00
Joachim F c235bf3e3d Merge pull request #26792 from mdorman/emacs-updates
Automated Emacs package updates
2017-06-25 15:33:19 +01:00
dywedir 33e4afa172 tiled: 0.18.2 -> 1.0.1 2017-06-25 01:08:00 +03:00
John Ericson afd2bdbad2 Merge pull request #26007 from obsidiansystems/cc-wrapper-prefix
Get rid of gcc-cross-wrapper
2017-06-23 11:22:34 -04:00
Michael Alan Dorman eea95af5d1 melpa-packages: 2017-06-23
Removals:
 - todochiku - Removed from melpa
2017-06-23 11:05:12 -04:00
Michael Alan Dorman 40e17794ce melpa-stable-packages: 2017-06-23 2017-06-23 11:05:12 -04:00
Michael Alan Dorman a10c8a97b4 org-packages: 2017-06-23 2017-06-23 11:05:12 -04:00
Michael Alan Dorman 8a714e3bb6 elpa-packages: 2017-06-23 2017-06-23 11:05:11 -04:00
John Ericson 7bdacad8b3 ed: Modernize and fix for cross 2017-06-22 17:53:53 -04:00
John Ericson 8b22e497f2 vim: Modernize derivation, hopefully fixing cross 2017-06-22 17:53:53 -04:00
Volth a2605322c6 fixed regexp, it did not match the last block 2017-06-22 19:16:19 +00:00
Volth 7fa29f39d1 a little simpification (use File::Slurp) 2017-06-22 19:08:19 +00:00
Volth 00101eb7c9 jetbrains updater: use perlPackages.LWPProtocolhttps 2017-06-22 19:00:28 +00:00
Jörg Thalheim d1eefba3a4 jetbrains: use nix-shell shebang in update script 2017-06-22 17:34:04 +01:00
Volth 1a87975910 update script for jetbrains products 2017-06-22 16:06:23 +00:00
Volth bf5c57e1b8 jetbrains.{ruby-mine,webstorm,datagrip,phpstorm}: 2017.1 -> 2017.1.4 2017-06-21 19:35:02 +00:00
Thomas Tuegel c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel be7b7d908f
Remove kdeWrapper 2017-06-18 08:43:39 -05:00
Thomas Tuegel 6beea32ab1
kdeApplications: rename kdeApp to mkDerivation 2017-06-18 08:42:20 -05:00
Thomas Tuegel 210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Tim Steinbach d990d618c0
atom: 1.17.2 -> 1.18.0 2017-06-16 08:09:15 -04:00
Tim Shaffer e973c75d65 vim: update URL for vimrc
Previous URL was returning a 404. Adjusting the query parameters fixes
things.
2017-06-13 13:31:17 -04:00
Michael Alan Dorman 97d750eac0 melpa-packages: 2017-06-12 2017-06-12 09:54:26 -04:00
Michael Alan Dorman 76082b63e8 melpa-stable-packages: 2017-06-12 2017-06-12 09:54:22 -04:00
Michael Alan Dorman beb18e1350 org-packages: 2017-06-12 2017-06-12 09:54:17 -04:00
Michael Alan Dorman 0e532a3ede elpa-packages: 2017-06-12 2017-06-12 09:54:17 -04:00
Jörg Thalheim a1b7dec225 Merge pull request #26502 from vdemeester/update-gogland
idea.gogland: 171.4424.55 -> 171.4694.35
2017-06-10 21:59:46 +01:00
Jörg Thalheim 0cec85d0eb
jetbrains.clion: fix bundled tools 2017-06-10 21:46:56 +01:00
Vincent Demeester 0a6dd6d07b
idea.gogland: 171.4424.55 -> 171.4694.35
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-10 16:33:11 +02:00
Winnie Quinn 6736ec318a vscode: 1.12.2 -> 1.13.0 2017-06-09 22:17:23 -04:00
Michael Weiss b615c2e992 android-studio: 2.3.2.0 -> 2.3.3.0 2017-06-09 18:46:54 +02:00
Joachim F 7badb92629 Merge pull request #26404 from ambrop72/kdevelop-511
kdevelop: 5.0.4 -> 5.1.1
2017-06-09 08:44:01 +01:00
Jörg Thalheim ffdfa662fc Merge pull request #26476 from romildo/upd.jetbrains
jetbrains.clion: 2017.1.1 -> 2017.1.3, jetbrains.idea-community: 2017.1.3 -> 2017.1.4, jetbrains.idea-ultimate: 2017.1.3 -> 2017.1.4
2017-06-08 21:35:24 +01:00
Tuomas Tynkkynen 97d29ffbfd nano: 2.8.3 -> 2.8.4 2017-06-08 23:13:06 +03:00
romildo 277b562324 jetbrains.idea-community: 2017.1.3 -> 2017.1.4 2017-06-08 16:57:50 -03:00
romildo bc1f59fb4f jetbrains.idea-ultimate: 2017.1.3 -> 2017.1.4 2017-06-08 16:45:14 -03:00
romildo b57a14810b jetbrains.clion: 2017.1.1 -> 2017.1.3 2017-06-08 15:54:51 -03:00
Urban Škudnik df8837ccfa jetbrains.idea-ultimate: 2017.1.2 -> 2017.1.3 2017-06-07 17:17:28 +02:00
Ambroz Bizjak 8f4619bb3d kdevelop: 5.0.4 -> 5.1.1
Including also a patch for bug https://bugs.kde.org/show_bug.cgi?id=379433
which is a quite annoying regression from 5.0.4. The patch is the same as
the change committed upstream.
2017-06-06 18:50:43 +02:00
Gabriel Ebner ec418babad Merge pull request #26364 from winniequinn/vscode-1.12.2
vscode: 1.12.1 -> 1.12.2
2017-06-04 08:23:42 +02:00
Michael Alan Dorman fdb3617888 melpa-packages: 2017-05-30 2017-05-30 15:56:33 -04:00
Michael Alan Dorman 60cc275ace melpa-stable-packages: 2017-05-30 2017-05-30 15:56:33 -04:00
Michael Alan Dorman 786388b85b elpa-packages: 2017-05-30 2017-05-30 15:56:33 -04:00
Winnie Quinn d55c21d89d vscode: 1.12.1 -> 1.12.2 2017-05-27 13:00:26 -04:00
Volth b7ccf27229 rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2 2017-05-26 13:43:25 +00:00
Joachim F 7596d21f69 Merge pull request #26102 from mdorman/emacs-updates
Automated emacs package updates
2017-05-26 12:15:35 +01:00
Franz Pletz 4820c72cf7 Merge pull request #26107 from NeQuissimus/atom_1_17_2
atom: 1.17.0 -> 1.17.2
2017-05-26 01:28:02 +02:00
Tim Steinbach 9d8942c578
atom: 1.17.0 -> 1.17.2 2017-05-25 18:20:12 -04:00
Michael Alan Dorman 33916338f3 melpa-packages: 2017-05-25
Removed:
 - metafmt: repository no longer on github
 - nikola: repository no longer accessible (SSL issues)
 - org-mac-iCal: repository no longer accessible
 - org-mac-link: repository no longer accessible
2017-05-25 17:25:29 -04:00
Michael Alan Dorman 688cfcb1ba melpa-stable-packages - 2017-05-25
Removals:
 - metafmt: repository no longer on github
 - org-mac-iCal: repository no longer accessible
2017-05-25 17:25:28 -04:00
Michael Alan Dorman 46689baa83 org-packages: 2017-05-25 2017-05-25 17:25:28 -04:00
Michael Alan Dorman a310e6c27b elpa-packages: 2017-05-25 2017-05-25 17:25:28 -04:00
Valentin Robert 200d5c0c99 proofgeneral: revert needed deleted file 2017-05-25 12:51:04 -07:00
Aleksey Zhukov b6f2c44b8e
pycharm-professional: 2017.1.2 -> 2017.1.3 2017-05-25 14:46:28 +03:00
Aleksey Zhukov d1844f480b
pycharm-community: 2017.1.2 -> 2017.1.3 2017-05-25 14:46:11 +03:00
Joachim F 3ba63d0b05 Merge pull request #25905 from Ptival/proofgeneral-head
proofgeneral_HEAD: fix
2017-05-21 22:45:47 +01:00