2918 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christopher Lloyd	7364ff54a4	merge with robertlorentz-x86-64	2015-04-26 21:48:55 -04:00
Christopher Lloyd	3a4ee557c9	merge with timschmielau-cocotron	2015-04-26 19:56:18 -04:00
Christopher Lloyd	851078b2c9	Merge branch 'plasqdev-maint-v2'	2015-04-26 19:31:28 -04:00
Christopher Lloyd	1065f93323	merge with gennganz-integration2, no changes	2015-04-26 19:29:33 -04:00
Christopher Lloyd	5279eb5d7d	merge 6cc54d3 development-arts	2015-04-23 23:09:54 -04:00
Christopher Lloyd	a0336d6dbc	merge rolfanroni-cva	2015-04-13 21:53:33 -04:00
Christopher Lloyd	31afa06b6d	merge d6e06af ivucica-cocotron	2015-04-11 23:25:59 -04:00
Christopher Lloyd	b888cbf028	merge c39ecca	2015-04-11 22:48:58 -04:00
Christopher Lloyd	0e5c98c856	merge d2edba9 andyvn22-cocotron	2015-04-11 22:48:37 -04:00
Christopher Lloyd	51d6f4b24c	merge c97fca6 andyvn22-cocotron	2015-04-11 22:39:49 -04:00
Christopher Lloyd	ac3fcf39fa	merge 0503cb0	2015-04-11 22:33:21 -04:00
Christopher Lloyd	bd7bae31ba	merge c054083	2015-04-11 22:31:02 -04:00
Christopher Lloyd	4346ebb575	merge d66b595 andyvn22-cocotron	2015-04-11 22:30:35 -04:00
Christopher Lloyd	4fb7ebbb6b	merge 710e915	2015-04-11 22:25:54 -04:00
Christopher Lloyd	24846588a2	merge 2a72bc9 andyvn22-cocotron	2015-04-11 22:25:28 -04:00
Christopher Lloyd	ade1e20320	merge b959085 andyvn22-cocotron	2015-04-11 22:24:54 -04:00
Christopher Lloyd	a1e9b3f8cd	merge 05f6a16 andyvn22-cocotron	2015-04-11 22:24:14 -04:00
Christopher Lloyd	24a99a45c2	merge 1813a17 andyvn22-cocotron	2015-04-11 22:22:32 -04:00
Christopher Lloyd	8ed1c15955	merge c9ecf33 andyvn22-cocotron	2015-04-11 22:21:58 -04:00
Christopher Lloyd	90bb689d24	merge 026d6fe andyvn22-cocotron	2015-04-11 22:18:24 -04:00
Christopher Lloyd	a4cf947897	merge 0e5bc1f andyvn22-cocotron	2015-04-11 22:14:17 -04:00
Christopher Lloyd	6a5b382055	merge 28aba5e cjwlloyd-ac-2	2015-04-09 22:51:38 -04:00
Christopher Lloyd	17e17b6a1a	Fix build	2015-04-06 23:05:35 -04:00
Christopher Lloyd	9d8bebb8c8	merge d5a4eff, rhyscox-cocotron	2015-04-06 22:59:26 -04:00
Christopher Lloyd	7a792a7cdf	fix dupe methods	2015-03-30 22:57:54 -04:00
Christopher Lloyd	92c2156842	merge a3993d7	2015-03-30 22:55:39 -04:00
Christopher Lloyd	ffacaaa6a2	merge 6ea2f71	2015-03-30 22:39:24 -04:00
Christopher Lloyd	c7666b5d1e	merge d3c695d	2015-03-30 22:06:53 -04:00
Christopher Lloyd	5a2a5e1c01	merge 60e2c95	2015-03-30 22:06:35 -04:00
Christopher Lloyd	b76f9e3346	merge 5ec3034	2015-03-30 22:05:27 -04:00
Christopher Lloyd	4b53829273	merge 7066fd3	2015-03-30 22:04:40 -04:00
Christopher Lloyd	68d5edd8f8	merge 2fda5f3	2015-03-30 22:03:50 -04:00
Christopher Lloyd	1e0bc608c3	merge 67ab18d	2015-03-30 22:02:38 -04:00
Christopher Lloyd	071e9dfc26	merge f68b66b	2015-03-29 23:17:36 -04:00
Christopher Lloyd	ece5568936	merge 0edcba5	2015-03-29 23:16:19 -04:00
Christopher Lloyd	d8c6730636	merge c527440	2015-03-29 23:14:49 -04:00
Christopher Lloyd	c0a77af052	merge fc3b4b4	2015-03-29 23:13:15 -04:00
Christopher Lloyd	c1d272c9bf	merge 61556ff	2015-03-29 23:10:35 -04:00
Christopher Lloyd	059cce0b6a	merge 87bdd7e	2015-03-29 23:08:08 -04:00
Christopher Lloyd	d3c4698b6f	merge 795960a	2015-03-29 23:03:19 -04:00
Christopher Lloyd	1063458a2a	merge b3ac04b	2015-03-29 23:01:12 -04:00
Christopher Lloyd	c0185d7525	merge dcdf46c	2015-03-29 23:00:41 -04:00
Christopher Lloyd	f738dc44f9	merge fa2cbb5	2015-03-29 22:58:59 -04:00
Christopher Lloyd	0e03222d97	turn off libjpeg by default	2015-03-29 17:52:06 -04:00
Christopher Lloyd	f4f2d1925b	Fix Foundation build	2015-03-29 17:47:57 -04:00
Christopher Lloyd	17e1509036	fix build	2015-03-29 17:46:18 -04:00
Christopher Lloyd	df22126f68	merge 7609825	2015-03-28 22:51:56 -04:00
Christopher Lloyd	9f7e20864c	merge 1976959	2015-03-28 22:51:13 -04:00
Christopher Lloyd	f4d94cfa6b	merge df7d82b	2015-03-28 22:48:03 -04:00
Christopher Lloyd	c76161aeac	merge d7b9468	2015-03-28 22:47:24 -04:00