nixpkgs/pkgs/applications/editors
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
..
bvi
eclipse * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
ed * New version of ‘ed’. W00t! 2011-12-12 23:44:49 +00:00
elvis * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
emacs-22 In Emacs site-start.el check that NIX_PROFILES is set. 2012-01-04 05:48:38 +00:00
emacs-23 emacs: updated 23.3 to 23.3b 2012-01-21 18:46:37 +00:00
emacs-24 emacs-24 alsaLib and imagemagickBig 2012-01-23 00:55:48 +00:00
emacs-modes svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
gobby Drop 'gnomevfs = gnome_vfs;' alias 2011-10-08 12:06:03 +00:00
jedit * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
joe
kdevelop
kile Drop kde3.kile 2011-10-07 20:46:29 +00:00
leksah
monodevelop Drop 'gnomevfs = gnome_vfs;' alias 2011-10-08 12:06:03 +00:00
monodoc
nano
nedit * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
nvi * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
texmacs
vim
zile GNU Zile 2.4.3. 2012-01-18 20:51:58 +00:00