Commit graph

986 commits

Author SHA1 Message Date
Frederik Rietdijk 60e2dced1a mirage: use pillow instead of pil 2015-12-08 15:11:00 +01:00
Frederik Rietdijk a044b590fc mcomix: use pillow instead of pil 2015-12-08 15:10:40 +01:00
Thomas Tuegel 4b950d233e ipe: 7.1.8 -> 7.1.10 2015-12-07 05:50:02 -06:00
Tobias Geerinckx-Rice b3635acffb swingsane: init at 0.2 2015-12-06 23:44:13 +01:00
Tobias Geerinckx-Rice 1d4b4dc8b6 saneBackends{,Git}: add more descriptive descriptions 2015-12-05 23:42:56 +01:00
Tobias Geerinckx-Rice df4ab4c9cc saneBackendsGit: add myself as maintainer 2015-12-05 23:42:56 +01:00
Tobias Geerinckx-Rice d3d5c79582 saneBackendsGit 1.0.24.73-g6c4f6bc -> 1.0.25.177-g753d123 2015-12-05 23:42:56 +01:00
Tobias Geerinckx-Rice 5bcd13156c saneBackends: add myself as maintainer 2015-12-05 23:42:56 +01:00
Tobias Geerinckx-Rice 256cec9756 saneBackends 1.0.24 -> 1.0.25
Changes too numerous to list here:

http://anonscm.debian.org/cgit/sane/sane-backends.git/tree/ChangeLog?h=RELEASE_1_0_25
2015-12-05 23:42:56 +01:00
Domen Kožar 67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Tobias Geerinckx-Rice 2742025f29 apitrace 7.0 -> 7.1 2015-11-26 08:00:02 +01:00
Michael Raskin d53213677d Merge pull request #11248 from joachifm/more-trivial-builderDefs
More trivial builderDefs translations
2015-11-24 17:15:45 +03:00
Michael Alan Dorman 1c331d0c33 shotwell: fix failure to configure
Without this change, shotwell would fail even to configure, for lack of
gudev; I infer that libgudev was recently split off of udev, since this
was working fine until a couple of weeks ago.
2015-11-24 08:52:48 -05:00
Joachim Fasting ddb9c3b701 xaos: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Tobias Geerinckx-Rice ef0265e3dc simple-scan 3.19.1 -> 3.19.2 2015-11-24 01:40:41 +01:00
Pascal Wittmann 9877cfb600 phototonic: init at 1.7 2015-11-22 13:00:57 +01:00
Domen Kožar 704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Lluís Batlle i Rossell bec459a94e Updating freecad to 0.15
(cherry picked from commit 8a18bc8722dc1739b5b2109d556032ca9a068bbd)

Conflicts:
	pkgs/top-level/all-packages.nix
2015-11-18 17:21:01 +01:00
rnhmjoj 994753322c imv: add version in the package name 2015-11-14 10:11:12 +01:00
Arseniy Seroka 7ee9959984 Merge pull request #10990 from rnhmjoj/imv
imv: init at 1.0.0
2015-11-13 17:41:42 +03:00
rnhmjoj 03121cd5ac imv: init at 1.0.0 2015-11-12 19:40:00 +01:00
Demin Dmitriy 0d12bbe574 pinta: Add installation of manpages and .desktop, locale and icon files 2015-10-30 06:39:09 +03:00
Demin Dmitriy 0ec62e0759 pinta: 1.4 -> 1.6 2015-10-29 21:51:41 +03:00
Tobias Geerinckx-Rice 86805242ac simple-scan: remove PackageKit dependency
It has now been made properly optional.
2015-10-27 03:17:17 +01:00
Tobias Geerinckx-Rice 4b27f54db7 simple-scan 3.18.1 -> 3.19.1 2015-10-27 03:17:16 +01:00
Pavan Rikhi 01a903335c pencil: v2.0.13 -> v2.0.14 2015-10-15 11:40:37 -04:00
Nikolay Amiantov 2a117cda41 yed: 3.14.3 -> 3.14.4 2015-10-15 17:06:23 +03:00
Tobias Geerinckx-Rice 8222eeca6e simple-scan 3.18.0 -> 3.18.1 2015-10-13 20:07:18 +02:00
William A. Kennington III d9813ed4ac feh: 2.13.1 -> 2.14 2015-10-05 11:05:40 -07:00
Gabriel Ebner ff308d06e9 viewnior: 1.4 -> 1.5 2015-10-04 11:56:32 +02:00
Tobias Geerinckx-Rice 4a92863fd5 enblend-enfuse: rename to actual package name
Retain old and unreadable "enblendenfuse" alias for compatibility.
2015-10-02 05:34:34 +02:00
Thomas Tuegel 2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Tobias Geerinckx-Rice 19dd43ba32 simple-scan: 3.17.92 -> 3.18.0 2015-09-22 03:44:48 +02:00
Vladimír Čunát a4d721efd7 djview: update 4.8 -> 4.10.3
Also kill tabs, remove unneeded (and failing) patch.
No qt5 yet, unfortunately.
2015-09-20 08:44:24 +02:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Tobias Geerinckx-Rice 49abb378e3 simple-scan: 3.17.91 -> 3.17.92 2015-09-14 10:20:38 +02:00
Cillian de Róiste a3a522286d synfigstudio: upgrade 0.64.3 -> 1.0.1 2015-09-13 20:58:22 +02:00
Arseniy Seroka 0948ead400 Merge pull request #9761 from eduarrrd/photoqt
Photoqt bump
2015-09-10 22:20:02 +03:00
Eduard Bachmakov 09bf6c95c6 photoqt: 1.2 -> 1.3 2015-09-09 19:00:51 -04:00
Eduard Bachmakov f040a1443e graphicsmagick: 1.3.18 -> 1.3.21 2015-09-09 19:00:37 -04:00
Tobias Geerinckx-Rice fb61a48ebf simple-scan: 3.17.90 -> 3.17.91 2015-09-05 04:20:23 +02:00
Luca Bruno 5c014feb0a imagemagick: fix ghostscript reference in .la files 2015-09-03 12:21:33 +02:00
Domen Kožar 0dfdb8938b meshlab: broken on i686 2015-09-02 20:26:02 +02:00
koral f5615752ae imagemagick: 6.9.1-0 -> 6.9.2-0, fixes #9591 2015-09-01 21:55:24 +02:00
Cillian de Róiste e67a0119e2 kde4.digikam: update from 4.11.0 to 4.12.0 2015-08-30 17:38:03 +02:00
Eelco Dolstra 1502117418 sane-backends: Separate doc output 2015-08-27 19:07:44 +02:00
Cillian de Róiste 2afaaf157e darktable: update from 1.6.7 to 1.6.8 2015-08-26 22:59:37 +02:00
Nikolay Amiantov fdb5ab0bba yed: change the go-to page per vendor request 2015-08-24 12:03:49 +03:00
Nicolas B. Pierron bb81ba7ef6 sane-config: Prevent find warnings by moving maxdepth argument first. 2015-08-23 13:55:25 +02:00
Nicolas B. Pierron f8caa49f00 sane-config: Merge /etc/sane.d/dll.conf content. 2015-08-23 13:54:34 +02:00
Nikolay Amiantov c6c2e253a6 yed: 3.14.2 -> 3.14.3, mark as not redistributable
Their license explicitly prohibits distribution and it's unclear whether they allow to download their binary automatically. I've asked to clarify their terms; this may be temporary.
2015-08-22 13:54:11 +03:00
Nikolay Amiantov 21c9f40b4d yed: fix checksum 2015-08-22 11:38:13 +03:00
Bjørn Forsman c9c3a3cb72 meshlab: add missing patch (doh!)
Should have been included in af7d5f27d0 ("meshlab: 1.3.2 -> 1.3.3").
2015-08-20 16:06:29 +02:00
Bjørn Forsman af7d5f27d0 meshlab: 1.3.2 -> 1.3.3
Remove patches that no longer apply (integrated upstream I guess), but
forward port the part that adds the missing "include <unistd.h>"[1].

Build and run tested.

[1]: http://sourceforge.net/p/meshlab/bugs/342/
2015-08-20 07:36:47 +02:00
Tobias Geerinckx-Rice 8131ca52d1 simple-scan: update 3.17.4 -> 3.17.90
Adds a dependency on PackageKit...

In better news:
 - Default to PDF when saving in all cases.
 - Always show file format options and use a combo box to fit better into
   dialog.
 - Detect HP scanners and install drivers using PackageKit if found.
 - If SANE detects no scanners but we see USB IDs of Brother, Epson or
   Samsung scanners then prompt the user to go to their website to install
   drivers.
 - Use GUsb instead of GUdev.
 - Fix error dialogs not showing.
2015-08-20 04:41:11 +02:00
Bjørn Forsman 2d17e52dc1 solvespace: download from github instead of gitorious
gitorious has shut down. Long live github.
2015-08-16 19:09:27 +02:00
Thomas Tuegel f0a11cd1eb ipe: add missing libjpeg dependency 2015-08-14 22:30:48 -05:00
Thomas Tuegel 7203497ce4 ipe: set LUA_PACKAGE name for make 2015-08-14 22:30:21 -05:00
Thomas Tuegel cce9a0f4d8 ipe: version 7.1.8 2015-08-14 22:29:58 -05:00
Thomas Tuegel df5f0cfb7c ipe: set platforms = linux 2015-08-14 22:28:51 -05:00
Thomas Tuegel 48a2034308 ipe: add ttuegel to maintainers 2015-08-14 22:28:42 -05:00
Thomas Tuegel c40dae0863 ipe: fix homepage 2015-08-14 22:28:23 -05:00
Lluís Batlle i Rossell 587f4f022e Making openimageio use parallel building.
(cherry picked from commit ff31b14cc51d3f493c62fb3074edc0c57fe8b7ce)
2015-08-12 11:04:54 +02:00
Damien Cassou a73336ad67 pencil 2.0.11 -> 2.0.13 2015-08-09 00:08:05 +02:00
Tobias Geerinckx-Rice fa7a0f24a4 Revert "simple-scan: fix build by adding lcms to buildInputs"
This reverts commit 37ff33196f.

This can't be it. `lcms` and `lcms2` are two entirely different packages.

Furthermore, the dependency is propagated through colord and should be
fixed there, if needed.
2015-08-07 01:45:18 +02:00
Pascal Wittmann 37ff33196f simple-scan: fix build by adding lcms to buildInputs 2015-08-06 16:32:46 +02:00
Ambroz Bizjak ce32291716 openscad: 2014.03 -> 2015.03-1
- Added dependencies harfbuzz, qscintilla, gettext.
- Removed redundant CFLAGS hack for eigen.
2015-08-06 10:30:17 +02:00
Arseniy Seroka a75c725fd4 Merge pull request #7954 from qknight/inkscape_boxmaker
inkscape with boxmaker plugin
2015-08-04 17:14:35 +03:00
Eelco Dolstra 55932c1bec Don't statically depend on cacert for certificates
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
lethalman 35231964af Merge pull request #8859 from rycee/update/gimpPlugin.gmic
gimpPlugins.gmic: 1.5.7.2 -> 1.6.5.0
2015-07-30 18:19:20 +02:00
Luca Bruno 8dbc328ad6 shotwell: use gnome3.rest to fix build 2015-07-30 13:01:03 +02:00
Eelco Dolstra 7e8165b277 imagemagick: Move docs to separate output
This reduces the size of out from 21 MB to 8.7 MB.
2015-07-26 23:39:47 +02:00
Eelco Dolstra 7f0a596473 imagemagick: Reduce dependency bloat
The closure size of imagemagick has recently gone up from 530 MB
(already bad) to 846 MB, which is a bit excessive. So revert most of
the recent changes.
2015-07-26 23:33:49 +02:00
Eelco Dolstra a68de0cc16 Revert "geeqie: update from 1.1 to 1.2"
This reverts commit 82e07fb1e8. See
fee59b1235.
2015-07-26 22:46:45 +02:00
Tobias Geerinckx-Rice b8a5fab116 Merge pull request #8943 from lancelotsix/update_digikam
kde4.digikam: 4.10.0 -> 4.11.0
2015-07-25 01:37:52 +02:00
Tobias Geerinckx-Rice ec15244f1a apitrace: 6.1 -> 7.0
- Many bug fixes
- Switch to Qt 5
2015-07-23 03:12:24 +02:00
Tobias Geerinckx-Rice b1e58a7720 simple-scan: 3.17.3 -> 3.17.4 2015-07-22 16:57:41 +02:00
Lancelot SIX bb823e900a kde4.digikam: 4.10.0 -> 4.11.0 2015-07-22 09:28:58 +00:00
Robert Helgesson 3eaa7ba417 gmic: 1.5.7.2 -> 1.6.5.0 2015-07-21 21:45:00 +02:00
Luca Bruno 5a4d349ce7 processing: fix build (ZHF) 2015-07-21 16:18:21 +02:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Eelco Dolstra 24d922ec3a openimageio: Update to 1.4.16 and fix name
(cherry picked from commit 17994d9e54448d71246f1221b188118fa7653ff7)
2015-07-02 15:36:42 +02:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Pascal Wittmann 5ade71b1d7 pencil: wrap bin/pencil correctly, fixes #8551 2015-06-29 17:04:35 +02:00
Tuomas Tynkkynen 3dafe7a466 xfig: Fix build failure now visible due to #7524
The first 'find' command in postUnpack that attempts to add +x
permissions fails, because the +x permission is needed by the find
itself, and with the xargs method it's added too late.
2015-06-27 18:44:06 +03:00
Tobias Geerinckx-Rice 67f3c77fe6 simple-scan -> 3.17.3 2015-06-22 14:38:34 +02:00
Christoph Hrdinka fe010d893d darktable: update 1.6.6 -> 1.6.7 2015-06-18 14:13:27 +02:00
Tobias Geerinckx-Rice 98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Pascal Wittmann 681b9bf9f9 Merge pull request #8284 from eduarrrd/photoqt
photoqt: 1.1.0.1 -> 1.2
2015-06-11 11:36:45 +02:00
Eduard Bachmakov 11f0f3cba9 photoqt: 1.1.0.1 -> 1.2
remove no longer necessary patch
2015-06-10 21:47:50 -04:00
lethalman 9ed71a26fe Merge pull request #8094 from rzetterberg/antimony
Adds antimony 0.8.0b CAD program
2015-06-08 15:04:01 +02:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
goibhniu c17aa9d3c6 Merge pull request #7875 from fkz/digikam
updated digikam to version 4.10.0
2015-06-05 17:53:55 +02:00
Eelco Dolstra 5d8fe045b6 Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
2015-06-04 14:54:50 +02:00
Richard Zetterberg 1847e204e0 Adds antimony 0.8.0b CAD program 2015-06-02 11:11:39 +02:00
Pavan Rikhi 8bea2bc5bb pencil: v2.0.10 -> v2.0.11 2015-06-01 10:18:14 +02:00
Pascal Wittmann a35161177e fbida: update from 2.09 to 2.10
add meta info and adpot it
2015-05-31 16:30:24 +02:00
Cillian de Róiste 72b259f61e darktable: update from 1.6.4 to 1.6.6 2015-05-31 13:12:39 +02:00
Tobias Geerinckx-Rice 1d4bfeacc5 simple-scan 3.16.0.1 -> 3.17.2 2015-05-30 21:09:25 +02:00
William A. Kennington III cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
Peter Simons 99273a6716 Merge pull request #8047 from nckx/master
Don't use "with licenses;" for single licences
2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Pascal Wittmann 8b38912260 potrace: update from 1.11 to 1.12 2015-05-28 19:06:11 +02:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
William A. Kennington III 114b3b064b feh: 2.13 -> 2.13.1 2015-05-26 01:36:35 -07:00
William A. Kennington III 6e41581809 feh: 2.12.1 -> 2.13 2015-05-24 01:52:12 -07:00
Joachim Schiele 582ecf4771 inkscape with boxmaker plugin 2015-05-23 12:47:15 +02:00
Mateusz Kowalczyk 6014752e73 tesseract: fix postInstall
We needed to separate each of the unpack commands.
2015-05-23 02:27:47 +01:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
aszlig adb7581459
tesseract: Allow to specify a subset of languages.
Especially useful for our OCR based VM tests, where we only need the
english language. By default the argument is null so all languages are
included. If a list of language name is passed only those languages are
enabled, for example:

tesseract.override { enableLanguages = [ "eng" "spa" ]; };

To only enable support for English and Spanish languages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 07:45:59 +02:00
Pascal Wittmann 10e001ab5b ocrad: update from 0.24 to 0.25 2015-05-19 20:08:15 +02:00
Luca Bruno 1b6401fd2e More usage of gnome3.defaultIconTheme 2015-05-19 14:40:04 +02:00
Fabian Schmitthenner 86cfcabfbb digikam: enable face recognition 2015-05-18 10:07:56 +00:00
Fabian Schmitthenner b2dc40401b updated digikam to version 4.10.0 2015-05-17 18:06:49 +00:00
Eric Seidel 67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang
Add isGNU and isClang attributes to cc-wrapper
2015-05-14 10:09:07 -07:00
Nikolay Amiantov b575dc53ad yEd: update 2015-05-12 17:25:24 +03:00
Eric Seidel 662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang}
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons 324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
William A. Kennington III 1adb482638 Convert more applications to libmysql 2015-04-22 16:09:41 -07:00
Joachim Fasting 8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Joel Moberg 49f4dba4c7 xournal: add license info 2015-04-20 18:22:37 +02:00
Cillian de Róiste 3c656e1014 darktable: update from 1.6.3 to 1.6.4 2015-04-20 14:49:55 +02:00
Tobias Geerinckx-Rice 6e6a41d1d6 apitrace 09519af205 -> 6.1 2015-04-17 00:46:21 +02:00
Arseniy Seroka f029ccadc9 Merge pull request #7385 from Forkk/screencloud
Add package for Screencloud 1.2.0
2015-04-16 06:28:00 +03:00
Forkk f7865c29c2 screencloud: init at 1.2.0
Added a package for Screencloud, a program for taking screenshots and
uploading them to various websites.

This package was a bit finicky due to some nonsense in the CMakeLists
file, but it seems to work properly.

The package also includes API keys for the screencloud.net website.
According to the author of the Arch Linux User Repo package for
screencloud, these keys are only used for usage tracking, so we should
be fine including them in the package here.
2015-04-15 22:04:39 -05:00
Pavan Rikhi 8571ce2a8a pencil: v2.0.9 -> v2.0.10 2015-04-14 07:25:36 -04:00
William A. Kennington III 6044bfe3af feh: 2.12 -> 2.12.1 2015-04-12 20:34:20 -07:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Pavan Rikhi 251f801719
pencil: v2.0.8 -> v2.0.9 2015-04-09 03:54:13 -04:00
Aristid Breitkreuz 13360ba5dc Merge pull request #7257 from spwhitt/inkscape
Fixes to build inkscape on Darwin
2015-04-08 21:59:48 +02:00
Spencer Whitt 22dfdbd2cf inkscape: patch to build with clang (Darwin) 2015-04-08 01:05:51 -04:00
Spencer Whitt ce1e7cccb6 feh: enable build on Darwin 2015-04-07 18:49:27 -04:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Ryan Mulligan 93f1029b0f Get rid of fetchurlGnome
closes #1707
2015-04-04 22:22:12 -07:00
Arseniy Seroka d7382dc748 Merge pull request #7130 from spwhitt/gimp
Get GIMP to build on Darwin and misc. related fixes
2015-04-02 06:02:49 +03:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Spencer Whitt 2b79ac6339 gimp: build on Darwin 2015-04-01 19:25:06 -04:00
lethalman b6c7eba554 Merge pull request #7097 from prikhi/update-pencil
pencil: v2.0.5 -> v2.0.8
2015-03-31 10:10:23 +02:00
Pavan Rikhi f67ce9160d
pencil: v2.0.5 -> v2.0.8
Switch to actively developed fork.
2015-03-30 22:59:04 -04:00
Tobias Geerinckx-Rice ee7c9bd86a Add simple-scan 3.16.0.1 2015-03-31 00:51:47 +02:00
Michael Raskin 70a1e3c837 propagate many inputs in imagemagick: otherwise dependent builds fail 2015-03-30 08:46:16 +03:00
William A. Kennington III b058f829d2 ImageMagick: Disable HDRI for now 2015-03-29 19:37:53 -07:00
William A. Kennington III fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Nikolay Amiantov c7a0925ac2 yEd: update 2015-03-29 13:01:47 +03:00
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00