3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications/editors/emacs-modes
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
..
bbdb * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
cedet * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
cua * Get rid of all references to nix.cs.uu.nl. 2008-11-14 16:57:19 +00:00
ecb * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
emacs-w3m upgraded emacs-w3m 2012-02-06 19:08:58 +00:00
emms * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
haskell * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
hol_light * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
htmlize emacs htmlize: fix of broken source url. 2012-01-24 22:06:35 +00:00
jabber applications/editors/emacs-modes/jabber: New nixbuild. 2010-05-16 20:32:21 +00:00
jdee * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
magit emacs-modes/magit: updated to 1.1.0.0 2011-12-26 20:24:59 +00:00
maude pkgs/applications/editors/emacs-modes/maude: the "official" maude mode is crap; use the one from sourceforge instead 2010-08-26 19:03:52 +00:00
nxml * Get rid of all references to nix.cs.uu.nl. 2008-11-14 16:57:19 +00:00
org svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
php Emacs PHP mode: packaged. Patch by Karn Kallio. 2010-12-21 04:40:38 +00:00
prolog pkgs/applications/editors/emacs-modes/prolog: initial version of prolog-mode for Emacs 2009-11-27 17:40:56 +00:00
proofgeneral ProofGeneral 4.1 2011-12-13 01:13:46 +00:00
quack * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
remember Remember: Fix tiny things. 2008-04-22 09:07:34 +00:00
rudel * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
scala-mode * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
session-management-for-emacs * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
stratego * stratego-mode for emacs 2009-09-01 14:27:24 +00:00