76 commits

Author	SHA1	Message	Date
Mattias Andrée	6b49c94128	document the -o flag and update the change log	2012-10-11 23:40:11 +02:00
Mattias Andrée	43959ae2c5	Merge branch 'master' into develop	2012-10-11 23:09:44 +02:00
Mattias Andrée	bb5e26b8d8	changelog update	2012-10-11 22:43:55 +02:00
Mattias Andrée	eadd55dcb7	naming consistency: tomtherock ==> tom	2012-10-10 20:41:55 +02:00
Mattias Andrée	1cecddcc94	shiningarmor{weding ==> wedding}	2012-10-10 20:37:43 +02:00
Pablo Lezaeta	d6f317b5a5	Added more ponies, and rework shiningarmor cutiemark	2012-10-10 12:37:40 -03:00
Mattias Andrée	01ca2593fe	conflict resolve	2012-10-04 04:49:50 +02:00
Mattias Andrée	e6bdf2e5ba	word wrapping bug fixed + word wrapper supports soft hythens and non-breaking space + word wrapper colour inserted hyphens red	2012-10-04 04:46:55 +02:00
Pablo Lezaeta	6930f5d242	Added 5 ponies, we have 300 poniesgit add ./dev/pony-checklist	2012-10-03 11:52:08 -03:00
Mattias Andrée	bdd12dadb8	fix changelog pony order for last commit	2012-09-29 22:39:28 +02:00
Mattias Andrée	553f8fb3fc	Kerberos is [for some reason] spelled [and pronounced] Cerberus in English	2012-09-29 22:38:14 +02:00
Mattias Andrée	3447dcdab7	Merge branch 'develop'	2012-09-29 22:21:14 +02:00
Pablo Lezaeta	740a653212	Added Meliot from winter Wrap up	2012-09-26 11:45:24 -03:00
Pablo Lezaeta	d1c994567b	Added Horse MD, and Cow	2012-09-22 18:38:25 -03:00
Mattias Andrée	140d04b2ca	conflict resolve + typo + m	2012-09-17 19:24:05 +02:00
Pablo Lezaeta	93ef66c65a	nanone	2012-09-15 01:32:53 -03:00
Pablo Lezaeta	46aec1e862	Added Nyx and Nyx Disguised (Past Sins)	2012-09-15 01:25:24 -03:00
Pablo Lezaeta	87dde6c624	Cracky to crackle, my fault	2012-09-14 21:48:09 -03:00
Pablo Lezaeta	3008d6509b	Added Pinkamina Diane Pie Cupcake; Not sure if you want have them, this is why I pull to develop	2012-09-14 19:20:07 -03:00
Pablo Lezaeta	9841942ebc	Added The big Lebowsky ponies, Kerberos, Manticore, Pinkie and Gummy disguise; and Blueball Blitz from varous fanfics related to shadowbolts (She is one shadowbolt)	2012-09-13 23:27:29 -03:00
Pablo Lezaeta	0fc9ebc60f	Added All 11 drhooves to extraponies, fix specie for posey and added Basil the dragon ripped from Pony Fantasy 6	2012-09-11 18:38:55 -03:00
Pablo Lezaeta	831cda3c31	Hasbro notified one of their licensors, Mighty Fine, that the character is named Dr. Hooves, at same time the traiding card say the character is named Time Turner too; drhooves in ponies point to timeturner fallow those two notices	2012-09-06 22:46:38 -03:00
Pablo Lezaeta	62cdc8cb29	More ponies: Candilycious, Cherrycola and Pigpen (Too Smell), and lotus have simlink to lotusbloosom	2012-09-06 21:08:19 -03:00
Pablo Lezaeta	013fdb6a1c	Fix pull and local diferences	2012-09-06 20:52:34 -03:00
Mattias Andrée	728abf9353	m (forgot to stage change log)	2012-09-05 23:08:58 +02:00
Pablo Lezaeta	52197bad9e	Simlink lotus to lotusbloosom	2012-09-04 22:24:35 -03:00
Pablo Lezaeta	346a237c48	Added 4 ponies and 2 extraponies	2012-09-04 01:26:25 -03:00
Pablo Lezaeta	187f8ec6d7	Added Sparkler from surprise and fyrefñy tumbrs	2012-09-01 01:14:32 -04:00
Mattias Andrée	484f2eadfb	adding removing all classic make build system notice in change log	2012-09-01 05:50:53 +02:00
Mattias Andrée	e0f4c9268a	m doc	2012-09-01 05:23:43 +02:00
Pablo Lezaeta	bbf30f48ff	Added Posey	2012-08-31 19:04:43 -04:00
Pablo Lezaeta	c8d016858f	Added a 10 ponies, 1 extrapony and 3 symlinks	2012-08-31 17:45:21 -04:00
Mattias Andrée	f8d6677b25	fixing changelogs + correcting pixel size for timeturner + rebuilting ttypones: @jristz are you using the last version of util-say, our runs do no generated identical files?	2012-08-29 20:14:25 +02:00
Pablo Lezaeta	2cd8d34542	3 ponies, 1 dragon, 1 symlink changed and 1 pony moved to extraponies	2012-08-29 13:37:33 -04:00
Mattias Andrée	3e7ef7ea1f	m + m fix + twilightstartswirlthebearded is rather long, reducing to twilightthebearded	2012-08-28 05:54:59 +02:00
Pablo Lezaeta	ede27da6da	Added more ponies	2012-08-27 23:45:05 -04:00
Mattias Andrée	28d8263093	changelog	2012-08-27 17:35:08 +02:00
Mattias Andrée	9d4f5a8104	m	2012-08-27 17:13:03 +02:00
Pablo Lezaeta	1976909faa	Added extrapony SeaLyra	2012-08-27 00:04:18 -04:00
Mattias Andrée	a3ba93f508	change log update	2012-08-27 03:06:59 +02:00
Mattias Andrée	50d15291c2	change log and dep. update	2012-08-26 17:46:49 +02:00
Mattias Andrée	8189e455bf	incorrect version announcement for 2.4 mentioning in change log	2012-08-25 20:10:39 +02:00
Mattias Andrée	b58a931c1c	housekeeping	2012-08-25 01:36:50 +02:00
Mattias Andrée	38324c570b	info change log update + merge conflict	2012-08-23 03:19:57 +02:00
Mattias Andrée	8c0cb19323	versioning	2012-08-23 03:14:45 +02:00
Pablo Lezaeta	6bb29da243	Added All my personal non MLP-FiM ponies, Fyrefly, surprise, woon and woonanohat	2012-08-22 19:24:00 -04:00
Pablo Lezaeta	ab9a3292a8	Added mising version info to texinfo	2012-08-22 18:08:51 -04:00
Pablo Lezaeta	70a2a9ec2a	Added Blaze, The Wonderbolt; you are right, same from the toy	2012-08-20 01:40:25 -04:00
Mattias Andrée	6b84680fa3	m misc	2012-08-20 21:46:52 +02:00
Mattias Andrée	ab4b236eb7	change log update	2012-08-20 14:17:09 +02:00