commit | 4c1340b28496b0bfd5f76b2b24570fb618c36eda | [log] [tgz] |
---|---|---|
author | Marc Kriguer <myk@google.com> | Fri May 30 10:19:54 2014 -0700 |
committer | Marc Kriguer <myk@google.com> | Fri May 30 10:19:54 2014 -0700 |
tree | 9965115f1e74cff263e04b9c3c96fe755b2c8ff2 | |
parent | 3bc923696d41710f3228b6405465ce7584d701ac [diff] | |
parent | 83aec0171bc832c42f01a3f7321b27d73a78da8f [diff] |
Merge branch 'master' of https://code.google.com/p/plexi.ad
diff --git a/lib/plexi b/lib/plexi index 97c617d..ef7a357 160000 --- a/lib/plexi +++ b/lib/plexi
@@ -1 +1 @@ -Subproject commit 97c617d0cfd8713e8a4d7fbbe61bc6b3ebf2c3fd +Subproject commit ef7a357a5c3171f0a9e4fac117e6446b4820cf2a