2375 Commits

Author SHA1 Message Date
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
Christopher Lloyd
65e8618340 merge 3079a41 2015-03-28 22:36:58 -04:00
Christopher Lloyd
6b1d485935 merge 47da9c6 2015-03-28 22:20:51 -04:00
Christopher Lloyd
b61627afa9 merge 57a76a9 2015-03-28 22:19:05 -04:00
Christopher Lloyd
9a545d24d6 merge 86adb8f 2015-03-28 22:17:34 -04:00
Christopher Lloyd
ba42717df7 merge 6d0f5a1 2015-03-28 22:14:51 -04:00
Christopher Lloyd
7322260b3e merge 326841d 2015-03-28 22:14:18 -04:00
Christopher Lloyd
93e250ca99 merge 8404bc3 2015-03-28 22:13:34 -04:00
Christopher Lloyd
732fefbace merge 8c412d5 2015-03-28 22:12:19 -04:00
Christopher Lloyd
86059d3e5b merge 4c46482 2015-03-28 22:11:45 -04:00
Christopher Lloyd
164927910a merge 6a68a3a 2015-03-28 22:10:58 -04:00
Christopher Lloyd
3d2e0758c9 merge 9ef2b1c 2015-03-28 22:07:35 -04:00
Christopher Lloyd
b10d36b360 merge b5211d1 2015-03-28 22:00:57 -04:00