Commit graph

59 commits

Author SHA1 Message Date
Trevor Bramble
4b2a265baa Merge branch 'master' of github.com:sethwoodworth/solarized
Conflicts:
	vim-colors-solarized/README.mkd
2012-08-20 00:37:42 -07:00
Seth Woodworth
24a5133144 reverting the Modified date 2012-08-13 12:40:19 -04:00
Trevor Bramble
def3b410f0 Update vim-colors-solarized/README.mkd
Swap Xdefaults for Xresources. (Xdefaults is deprecated.)
2012-08-12 23:39:13 -07:00
Trevor Bramble
e50c1fe1d1 Merge pull request #132 from juhasz/master
Markdwon fix in vim colors readme (Advanced Configuration section)
2012-08-12 23:31:10 -07:00
Trevor Bramble
58bd9db1ac Merge pull request #196 from AnthonyDiSanti/master
Fixed typo in the vim README
2012-08-12 22:55:00 -07:00
Trevor Bramble
bbd24a5581 Merge pull request #95 from jpo/master
Typos in README files
2012-08-12 22:53:02 -07:00
Seth Woodworth
b466f09442 Fix the display of a table vim README 2012-08-02 13:50:52 -03:00
Anthony DiSanti
b000d11317 Fixed typo in the README 2012-04-27 17:06:34 -03:00
Márton Juhász
782b5969ae Fix markdown in Advanced Configuration section 2011-07-09 02:22:23 -07:00
Ethan Schoonover
856f366dcb Merge commit '528a59f26d12278698bb946f8fb82a63711eec21' 2011-05-09 14:45:24 -07:00
Ethan Schoonover
f16b2416f4 Merge commit '7a7e5c8818d717084730133ed6b84a3ffc9d0447' 2011-05-05 15:32:43 -07:00
Ethan Schoonover
680df556d9 Merge commit 'a8c94682fe86e556d190b8d22868538ad6149b3b' 2011-05-05 13:26:05 -07:00
Ethan Schoonover
3681b451ef Merge commit 'a7c77fa73b4f1340af242bae0dbbb269e1768a38' 2011-05-05 13:03:55 -07:00
Ethan Schoonover
8d2931e7cf Merge commit '8ee3566a413197a7414bf60c47ff2221e8ffb8e7' 2011-05-05 12:46:01 -07:00
Ethan Schoonover
a4be301d06 Merge commit '1ebc43af72ecf8499d4057b5ace63c37f84ca7d9' 2011-05-04 23:52:11 -07:00
Tim Pope
4f59544fb1 [vim] Override colors for diff filetype 2011-05-03 21:49:41 -04:00
Ethan Schoonover
b28e078015 Merge commit '54180f1a5bc7950af8c0a43a86e8146179f48eaa' 2011-05-03 13:03:04 -07:00
Ethan Schoonover
001565e72c Merge commit '15059af5216fa67b92f3fdd5a4e2dadd996a211e' 2011-05-03 00:13:06 -07:00
Ethan Schoonover
87211275bb Merge commit '2b30f611f1caf299f7f1637abe7d7b8eec058a09' 2011-05-02 10:13:49 -07:00
Ethan Schoonover
ce8a43aaed Merge commit '295f56b0121a9d3d40ce12e7e99ab35803cbacc6' 2011-05-01 02:16:43 -07:00
Ethan Schoonover
948aac7cb2 Merge commit 'd8aaf70840e1a00ae64585813a97d975565531eb' 2011-05-01 01:38:02 -07:00
Josh O'Rourke
e92e9708c1 Fix typo in vim README 2011-04-30 17:56:20 -07:00
Ethan Schoonover
a9ad17cc71 Merge commit '7fdec56a189191e3ea013b45d99915e455e533ec' 2011-04-30 15:08:46 -07:00
Ethan Schoonover
72ef029ca8 Merge commit 'ca234ef7ea236a1b9d0eb3f8f692b6935c9d6400' 2011-04-29 16:11:37 -07:00
Ethan Schoonover
4694535f87 Merge commit '4b0568dd06b5d04bb2c79ffd49d0898abe10ca18' 2011-04-16 10:51:48 -07:00
Ethan Schoonover
56e34f3256 Merge commit '177c82b1636b864c92937c9780658cc6eca87aa4' 2011-04-14 23:00:35 -07:00
Ethan Schoonover
6e8b7b4290 Merge commit 'a2657339e170443543d88a0aa11f383baf66e57b' 2011-04-14 22:37:17 -07:00
Ethan Schoonover
961decda66 Merge commit '4a9b7ecc66e6a451e273befcf418d36cb7167637' 2011-04-12 16:20:21 -07:00
Ethan Schoonover
2f8b4d2a9b Merge commit '4727d3afd6ac9278e4e5dcee6762ed8bb3501eef' 2011-04-10 00:11:03 -07:00
Ethan Schoonover
e0b6b4ee46 Merge commit 'c669333929b35d01deb3bdaaf655357b8921a0a3' 2011-04-09 21:51:55 -07:00
Ethan Schoonover
d5fcaceae4 Merge commit 'd93e97f05d7ea7fd8c7d7b79c2b6d522e1ffce1d' 2011-04-08 21:32:39 -07:00
Ethan Schoonover
4aedc8982a Merge commit '201aefb8230b332c10fc50b492698ae8e0034086' 2011-04-08 12:31:08 -07:00
Ethan Schoonover
86a875bb6e Merge commit 'bc35c899ec8ef23d481a95028b93ec50b04bd16c' 2011-04-08 00:35:19 -07:00
Ethan Schoonover
c50f779836 Merge commit '9f2b8bc69ddd589156d92fbdc9800c0e43328368' 2011-04-07 23:16:15 -07:00
Ethan Schoonover
80cf13b18b Merge commit 'd2b710d47b33f7cf4f3674e6f6287ea2fd3cc0ff' 2011-04-07 21:24:59 -07:00
Ethan Schoonover
ea27810af6 merged in vim subtree 2011-04-07 20:02:38 -07:00
Ethan Schoonover
79cf0717ec updated changelog and vim readme in prep for beta2 2011-03-26 13:25:20 -07:00
Ethan Schoonover
4353a49924 [vim] red updated; italic removed in term mode 2011-03-26 00:09:39 -07:00
Ethan Schoonover
04144df56c [vim] pulled in subtree; updated vim 256 mode 2011-03-24 16:01:46 -07:00
Ethan Schoonover
f792558e2e image updates 2011-03-24 10:47:46 -07:00
Ethan Schoonover
ffff8d64a0 Merge commit 'f329836275d2939cb5b984471b9f2e947e048357' 2011-03-23 13:33:07 -07:00
Ethan Schoonover
149f6a617d Merge commit '911de51ec7dd71af82283ce7c10519facef87f61' 2011-03-23 13:29:40 -07:00
Ethan Schoonover
06ee4d9fc8 Merge commit 'ece1e4a1eddebb3dc81ff6c44d2ca19be90da54a' 2011-03-23 13:27:26 -07:00
Ethan Schoonover
2a4b2096db Merge commit '6666646c69542e4759a7dd7e2b22b86287027614' 2011-03-23 13:23:41 -07:00
Ethan Schoonover
ea65b827dd Merge commit '8fc4f78449be3c0d2836c59d536efc002ff25704' 2011-03-23 11:54:40 -07:00
Ethan Schoonover
f7f2864296 Merge commit '56bb56fcd918aa81931332b4e1b976575588c350' 2011-03-23 09:54:28 -07:00
Ethan Schoonover
39ddf8387f Merge commit '59de68a3fd9b322a6bf8d7604c70ae886832bed9' 2011-03-23 00:10:15 -07:00
Ethan Schoonover
0d41505b09 Merge commit 'db0f2aac54932cbbbca79a3b677077e4e13c60f3' 2011-03-22 00:16:33 -07:00
Ethan Schoonover
21d931afb7 Merge commit '81b5dad6c7d8f564e018a7028d68b716738d89eb' 2011-03-18 14:07:41 -07:00
Ethan Schoonover
b31ee1d74e Merge commit 'be1012a425dac78af2a4565af1343c9d66f31758' 2011-03-16 23:49:38 -07:00