OSDN Git Service
The Android Automerger [Tue, 19 Mar 2013 12:55:05 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 19 Mar 2013 01:27:55 +0000 (18:27 -0700)]
JWQ77B
The Android Automerger [Mon, 18 Mar 2013 12:58:12 +0000 (05:58 -0700)]
JWQ77
The Android Automerger [Mon, 18 Mar 2013 12:55:25 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Lorenzo Colitti [Sat, 16 Mar 2013 00:41:49 +0000 (09:41 +0900)]
Include clatd in device builds.
Bug:
8276725
Change-Id: I6a4e9c9829ef676c6a3080c03a709be3ec863de5
The Android Automerger [Fri, 15 Mar 2013 19:58:19 +0000 (12:58 -0700)]
JWQ73C
Ying Wang [Fri, 15 Mar 2013 17:32:29 +0000 (10:32 -0700)]
Skip userdata.img only if partition size is not give for extfs.
We still build yaffs2 images which don't need partition size.
Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
Ying Wang [Fri, 15 Mar 2013 16:03:39 +0000 (09:03 -0700)]
Don't build userdata.img if no partition size
And retire BOARD_DONT_BUILD_USERDATA_IMG.
This unifies the logic in build/core/Makefile and
build/tools/releasetools/img_from_target_files.
Change-Id: Ib6b4e8e0d8279ed7deaf047e9dc30eb65aba013f
keunyoung [Thu, 14 Mar 2013 22:59:27 +0000 (22:59 +0000)]
Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
keunyoung [Tue, 12 Mar 2013 23:28:37 +0000 (16:28 -0700)]
add camera.goldfish.jpeg to emulator targets and mini targets
- For mini targets, it is for making camera work in mini-emulator targets
Change-Id: I0bebb3ae9135c78af8ba4209ba2ba60e074325b3
The Android Automerger [Thu, 14 Mar 2013 22:09:10 +0000 (15:09 -0700)]
JWQ73B
Ben Cheng [Wed, 13 Mar 2013 01:15:18 +0000 (18:15 -0700)]
Link libgcc.a before shared libraries (especially libc.so).
BUG:
8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
Raphael Moll [Thu, 14 Mar 2013 19:41:16 +0000 (12:41 -0700)]
resolved conflicts for merge of
a3aea5b6 to jb-mr2-dev
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
Raphael Moll [Thu, 14 Mar 2013 18:44:07 +0000 (11:44 -0700)]
am
0ec2f3df: Merge "Build SDK using prebuilts/devtools."
* commit '
0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3':
Build SDK using prebuilts/devtools.
Raphael Moll [Thu, 14 Mar 2013 18:31:36 +0000 (18:31 +0000)]
Merge "Build SDK using prebuilts/devtools."
The Android Automerger [Thu, 14 Mar 2013 12:57:18 +0000 (05:57 -0700)]
JWQ73
The Android Automerger [Thu, 14 Mar 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 13 Mar 2013 22:46:48 +0000 (15:46 -0700)]
JWQ72B
Raphael Moll [Wed, 13 Mar 2013 22:30:35 +0000 (15:30 -0700)]
Build SDK using prebuilts/devtools.
Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
any more but in the sdk/product.mk instead (which they were.)
Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
The Android Automerger [Wed, 13 Mar 2013 12:56:57 +0000 (05:56 -0700)]
JWQ72
The Android Automerger [Wed, 13 Mar 2013 12:55:10 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Stephen Hines [Wed, 13 Mar 2013 01:20:15 +0000 (01:20 +0000)]
Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev
Stephen Hines [Wed, 13 Mar 2013 00:10:19 +0000 (17:10 -0700)]
We need to use the ARM EABI to pass vector registers properly (i.e. float2).
Given the following function signature:
void rsDebug(const char *s, float2 f2);
Under the regular ARM ABI, the arguments would be passed as follows:
r0 <- s
r1 <- f2.x
r2 <- f2.y
Under the ARM EABI, the arguments would be passed as follows:
r0 <- s
r1 <- UNUSED due to alignment padding for vector operation
r2 <- f2.x
r3 <- f2.y
Change-Id: I2332c8555c00003ae900f299fa3aee1b3ccac439
The Android Automerger [Tue, 12 Mar 2013 22:20:23 +0000 (15:20 -0700)]
JWQ71B
Dianne Hackborn [Tue, 12 Mar 2013 19:31:11 +0000 (19:31 +0000)]
Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev
Dianne Hackborn [Tue, 12 Mar 2013 01:04:55 +0000 (18:04 -0700)]
Add LOCAL_APK_LIBRARIES argument.
This allows you to build apks that link against other
apks using the framework's new shared library apk feature.
Also if you are using LOCAL_APK_LIBRARIES, then LOCAL_DEX_PREOPT
will not be allowed. This is because using preopt means the
apk is stripped of its dex file, so the pre-installed apk can't
be redexed if its associated library changes. (Even if the build
system didn't strip the dex, Dalvik still has issues because it
assumes a pre-odex file is always valid.)
Change-Id: I952c0d24f8975f75aff67f78b5faeec91144c3e7
The Android Automerger [Tue, 12 Mar 2013 12:58:43 +0000 (05:58 -0700)]
JWQ71
The Android Automerger [Tue, 12 Mar 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 11 Mar 2013 22:50:48 +0000 (15:50 -0700)]
JWQ70C
keunyoung [Mon, 11 Mar 2013 21:48:54 +0000 (21:48 +0000)]
Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev
Scott Main [Mon, 11 Mar 2013 20:55:05 +0000 (13:55 -0700)]
am
e9d67dcc: am
56662610: am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
e9d67dccb01cf91d04b71f590b8e91737be70e64':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:51:18 +0000 (13:51 -0700)]
am
56662610: am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
5666261023e8b5362f848ccfd307d52c6b1f2150':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:49:53 +0000 (13:49 -0700)]
am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
5fef291f3e9fa5139d0876a960e0173ef77842da':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:48:34 +0000 (13:48 -0700)]
am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
3aca7544a51296777a91fa6e3ef203cebf14d04c':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:47:13 +0000 (13:47 -0700)]
am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
2d967c6df63c625659dbca486a4ba0a20c1f3561':
tweak jspane width property to ensure bg color for highlighted item is full width
The Android Automerger [Mon, 11 Mar 2013 19:05:10 +0000 (12:05 -0700)]
JWQ70B
keunyoung [Fri, 8 Mar 2013 20:54:36 +0000 (12:54 -0800)]
reflect the migration of emulator hal to device/generic/goldfish
- no longer need to check the presence as device/generic/goldfish is in PDK
Change-Id: I551dd283fb6511d8ebd45a8519f797f8ba2f1a05
Torne (Richard Coles) [Mon, 11 Mar 2013 16:31:08 +0000 (16:31 +0000)]
Merge "Don't try to group static libraries on mac." into jb-mr2-dev
Ying Wang [Mon, 11 Mar 2013 16:26:06 +0000 (09:26 -0700)]
am
4f499fba: am
c36f41fd: Merge "Support gdb wrappers"
* commit '
4f499fba73dd7bc04248f310df9b8b90f93d5de8':
Support gdb wrappers
Ying Wang [Mon, 11 Mar 2013 16:24:06 +0000 (09:24 -0700)]
am
c36f41fd: Merge "Support gdb wrappers"
* commit '
c36f41fd38c0dfc09ef486e6c3b2eda26c3a5b24':
Support gdb wrappers
Scott Main [Mon, 11 Mar 2013 16:21:07 +0000 (09:21 -0700)]
tweak jspane width property to ensure bg color for highlighted item is full width
Change-Id: I92e66493229476c29cf71c74091f36063638def4
Ying Wang [Mon, 11 Mar 2013 16:08:23 +0000 (16:08 +0000)]
Merge "Support gdb wrappers"
Torne (Richard Coles) [Mon, 11 Mar 2013 14:59:42 +0000 (14:59 +0000)]
Don't try to group static libraries on mac.
Mac's linker doesn't support --start-group and --end-group; it scans
libraries repeatedly even without these options, so it's not necessary.
Change-Id: If22527e75470f7fa9452dc33efe4d40a60d0919a
The Android Automerger [Mon, 11 Mar 2013 12:58:51 +0000 (05:58 -0700)]
JWQ70
The Android Automerger [Mon, 11 Mar 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Michael Wright [Sat, 9 Mar 2013 01:34:02 +0000 (17:34 -0800)]
Fixed whitespace and env pollution issues in pez
Change-Id: I40574d6cdab31e920535c09d24fe8463aee57586
Alex Ray [Fri, 8 Mar 2013 23:15:06 +0000 (15:15 -0800)]
pez: colored SUCCESS/FAILURE indicator
pez is a new bash function that can be prepended to existing functions
or commands to clearly show a colored exit status.
Example:
$ pez mmm frameworks/base/etc
will print all the usual output, and at the end either a green "SUCCESS"
line or a red "FAILURE" line.
Change-Id: I7e369b0280d6ece16fb0be1895278c26922491fe
John Michelau [Fri, 9 Nov 2012 17:48:04 +0000 (11:48 -0600)]
Support gdb wrappers
Use gdbwrapper() for launching gdb. This can be redefined to launch
one of the many gdb wrappers instead.
Example:
function gdbwrapper()
{
ddd --debugger $ANDROID_TOOLCHAIN/$GDB -x "$@"
}
Change-Id: I3cce8a2ca1bae6d531e2388a93cb52075b21a42c
Kenny Root [Fri, 8 Mar 2013 19:45:55 +0000 (11:45 -0800)]
am
ae9dc40d: am
eda13282: Merge changes I1998a9d6,I2513f0de
* commit '
ae9dc40d9e3a4dfe949b82b95d0e92012c4308e6':
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
Kenny Root [Fri, 8 Mar 2013 19:44:03 +0000 (11:44 -0800)]
am
eda13282: Merge changes I1998a9d6,I2513f0de
* commit '
eda132820bede79a109c16aa0c91bd6cb15380d8':
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
The Android Automerger [Fri, 8 Mar 2013 19:28:21 +0000 (11:28 -0800)]
JWQ66E
Kenny Root [Fri, 8 Mar 2013 19:23:00 +0000 (19:23 +0000)]
Merge changes I1998a9d6,I2513f0de
* changes:
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
Stephen Hines [Fri, 8 Mar 2013 18:59:53 +0000 (18:59 +0000)]
Merge "Mips needs to be marked little-endian explicitly." into jb-mr2-dev
Jeff Sharkey [Fri, 8 Mar 2013 18:20:47 +0000 (10:20 -0800)]
Function to grep AndroidManifest.xml files.
(cherry picked from commit
50b61e9e66bad2f8addc425271b41e74babf3a34)
Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
Jeff Sharkey [Wed, 20 Feb 2013 01:00:46 +0000 (17:00 -0800)]
Utility to dump stacks from arbitrary processes.
Saves any existing traces, dumps stacks from the target process,
then restores the original traces.
(cherry picked from commit
f582437162ff483b342ad9d02cb0af948a734c5a)
Change-Id: I2513f0de0d90cccd56c4949ca7d218e430439c00
Jeff Sharkey [Fri, 8 Mar 2013 18:53:04 +0000 (18:53 +0000)]
Merge "Function to grep AndroidManifest.xml files." into jb-mr2-dev
Jeff Sharkey [Fri, 8 Mar 2013 18:20:47 +0000 (10:20 -0800)]
Function to grep AndroidManifest.xml files.
Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
Stephen Hines [Fri, 8 Mar 2013 17:02:52 +0000 (09:02 -0800)]
Mips needs to be marked little-endian explicitly.
Change-Id: Id4a08124b6c809c29a5e338d7aa0741db3ac57a3
Ying Wang [Fri, 8 Mar 2013 02:57:52 +0000 (18:57 -0800)]
am
11872e25: am
c47bea9d: Merge "Remove nonexisting module names."
* commit '
11872e259252ffa45874c8e3ebe38a3c41bbd579':
Remove nonexisting module names.
Christopher Ferris [Fri, 8 Mar 2013 02:57:51 +0000 (18:57 -0800)]
am
b95a4ed6: am
161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."
* commit '
b95a4ed64aff542d04b667ff5f239d152735808a':
Adding TARGET_CPU_VARIANT to config file.
Ying Wang [Fri, 8 Mar 2013 02:55:30 +0000 (18:55 -0800)]
am
c47bea9d: Merge "Remove nonexisting module names."
* commit '
c47bea9dd9288bf429afe1434829afd5e8c208a0':
Remove nonexisting module names.
Christopher Ferris [Fri, 8 Mar 2013 02:55:29 +0000 (18:55 -0800)]
am
161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."
* commit '
161e0ef974d0cddf74b82bbe9c0843ca6f2f320e':
Adding TARGET_CPU_VARIANT to config file.
The Android Automerger [Fri, 8 Mar 2013 02:47:33 +0000 (18:47 -0800)]
JWQ66D
The Android Automerger [Fri, 8 Mar 2013 02:35:42 +0000 (18:35 -0800)]
JWQ66C
Ying Wang [Fri, 8 Mar 2013 02:30:48 +0000 (02:30 +0000)]
Merge "Remove nonexisting module names."
Ying Wang [Fri, 8 Mar 2013 02:28:53 +0000 (18:28 -0800)]
Remove nonexisting module names.
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
Christopher Ferris [Fri, 8 Mar 2013 02:18:08 +0000 (02:18 +0000)]
Merge "Adding TARGET_CPU_VARIANT to config file."
Christopher Ferris [Sat, 23 Feb 2013 01:24:25 +0000 (17:24 -0800)]
Adding TARGET_CPU_VARIANT to config file.
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Merge from internal master.
Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7
Ying Wang [Fri, 8 Mar 2013 01:58:32 +0000 (17:58 -0800)]
resolved conflicts for merge of
de949b11 to jb-mr2-dev
Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
Ying Wang [Fri, 8 Mar 2013 01:49:44 +0000 (17:49 -0800)]
am
671d90ea: Merge "Add module names to emulator PRODUCT_PACKAGES."
* commit '
671d90ea1d20312df60b700748d49dac17054099':
Add module names to emulator PRODUCT_PACKAGES.
Ying Wang [Fri, 8 Mar 2013 01:15:00 +0000 (01:15 +0000)]
Merge "Add module names to emulator PRODUCT_PACKAGES."
Tim Murray [Thu, 7 Mar 2013 23:34:11 +0000 (23:34 +0000)]
Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev
Doug Zongker [Thu, 7 Mar 2013 22:34:00 +0000 (22:34 +0000)]
Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev
Justin Ho [Thu, 7 Mar 2013 20:27:44 +0000 (12:27 -0800)]
Add fr_CA to l10n builds
Bug:
7579865
Change-Id: I92c1368b97ced96cacc560d829707b9b7de69ef4
The Android Automerger [Thu, 7 Mar 2013 21:56:07 +0000 (13:56 -0800)]
JWQ66B
Justin Ho [Thu, 7 Mar 2013 20:34:22 +0000 (20:34 +0000)]
Merge "Add fr_CA to l10n builds Bug:
7579865" into jb-mr2-dev
Justin Ho [Thu, 7 Mar 2013 20:27:44 +0000 (12:27 -0800)]
Add fr_CA to l10n builds
Bug:
7579865
Change-Id: I92c1368b97ced96cacc560d829707b9b7de69ef4
Scott Main [Thu, 7 Mar 2013 20:21:27 +0000 (12:21 -0800)]
am
e2b31818: am
5b654685: am
7b21b887: am
3797ec57: am
288099b2: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
e2b31818d6b5c27de1cbebaeb3ca5362c5ab1f9a':
Scott Main [Thu, 7 Mar 2013 20:21:26 +0000 (12:21 -0800)]
am
43403d90: am
774274d0: am
a8a80d78: am
5a0e36fe: am
415696d3: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
43403d905a65e21ec12ec3f6c64d566e7fe7a35f':
Scott Main [Thu, 7 Mar 2013 20:21:26 +0000 (12:21 -0800)]
am
a525786f: am
c4f84cbb: am
6f0172c4: am
e99ca7ae: am
2990dc10: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
a525786f825389565314361e3255bfd3d713c9a3':
Jean-Baptiste Queru [Thu, 7 Mar 2013 20:21:25 +0000 (12:21 -0800)]
am
c26c52a6: am
e47881e6: am
f8372271: (-s ours) am
17cbfdda: (-s ours) am
76bbd39a: (-s ours) am
22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
c26c52a6a0d097e2e28804347d8b0ada758109fa':
Scott Main [Thu, 7 Mar 2013 20:21:24 +0000 (12:21 -0800)]
am
aaf22c8d: am
70e053fb: am
f6c979e0: am
bfeae36e: am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
aaf22c8dd864c9bb8944106d4196969e950d2163':
Scott Main [Thu, 7 Mar 2013 20:21:24 +0000 (12:21 -0800)]
am
fc3a4e31: am
7c1cde1d: am
1cccea9b: am
cdf32e84: am
e892c86e: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
fc3a4e31edb22e0f908bdf8b73a0ce58abf1b9c2':
Ken Sumrall [Thu, 7 Mar 2013 20:21:23 +0000 (12:21 -0800)]
Scott Main [Thu, 7 Mar 2013 20:21:23 +0000 (12:21 -0800)]
Scott Main [Thu, 7 Mar 2013 20:21:22 +0000 (12:21 -0800)]
am
d1fa8591: am
9ae44c9d: am
589b4b3e: am
956d4c70: am
373318ca: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
d1fa85916dd2066fc1030682ecfd75639804bd1f':
Robert Ly [Thu, 7 Mar 2013 20:21:21 +0000 (12:21 -0800)]
am
9ac8c78d: am
dfc239ce: am
e28696da: am
116c59bb: am
cef5be2d: am
dae7b523: Revert "support differently named lists.js files"
* commit '
9ac8c78dfee09a6d9769e1fac024fee08070e3b7':
Scott Main [Thu, 7 Mar 2013 20:21:21 +0000 (12:21 -0800)]
am
50e9bdd0: am
c8141407: am
40741e48: am
4cc2bc77: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
50e9bdd0a4f3ef75ea7b76c553422fbaf72c7256':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Scott Main [Thu, 7 Mar 2013 19:49:23 +0000 (11:49 -0800)]
am
5b654685: am
7b21b887: am
3797ec57: am
288099b2: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
5b654685c08f51c94a0d269831228632cf6b281c':
Scott Main [Thu, 7 Mar 2013 19:49:22 +0000 (11:49 -0800)]
am
774274d0: am
a8a80d78: am
5a0e36fe: am
415696d3: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
774274d0e6ab8fa7218033cf1d058f6b6de2149c':
Scott Main [Thu, 7 Mar 2013 19:49:22 +0000 (11:49 -0800)]
am
c4f84cbb: am
6f0172c4: am
e99ca7ae: am
2990dc10: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
c4f84cbb933e23fe176d5909a294d54cbfa315b0':
Jean-Baptiste Queru [Thu, 7 Mar 2013 19:49:21 +0000 (11:49 -0800)]
am
e47881e6: am
f8372271: (-s ours) am
17cbfdda: (-s ours) am
76bbd39a: (-s ours) am
22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
e47881e655a687a7132af6647b8bcc2fdc784714':
Scott Main [Thu, 7 Mar 2013 19:49:20 +0000 (11:49 -0800)]
am
70e053fb: am
f6c979e0: am
bfeae36e: am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
70e053fbdcae0fcfd684409f957bd7e6734c4827':
Scott Main [Thu, 7 Mar 2013 19:49:20 +0000 (11:49 -0800)]
am
7c1cde1d: am
1cccea9b: am
cdf32e84: am
e892c86e: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
7c1cde1d90108c3fdd15c38e17f72fc5ca09e6e1':
Ken Sumrall [Thu, 7 Mar 2013 19:49:19 +0000 (11:49 -0800)]
am
fa84cfd1: am
f1a6ba57: am
4c5b0bf4: am
8d3e1e55: am
44281a1f: Add unified fstab support to release tools
* commit '
fa84cfd18161df6631af7c1b2be96b4ec3ee7174':
Scott Main [Thu, 7 Mar 2013 19:49:19 +0000 (11:49 -0800)]
Scott Main [Thu, 7 Mar 2013 19:49:18 +0000 (11:49 -0800)]
am
9ae44c9d: am
589b4b3e: am
956d4c70: am
373318ca: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
9ae44c9da7966c2f43d5e22871a65a16cf10b4cc':
Robert Ly [Thu, 7 Mar 2013 19:49:18 +0000 (11:49 -0800)]
am
dfc239ce: am
e28696da: am
116c59bb: am
cef5be2d: am
dae7b523: Revert "support differently named lists.js files"
* commit '
dfc239ce8692b542048670927bf7d46d9527d32f':
Scott Main [Thu, 7 Mar 2013 19:49:17 +0000 (11:49 -0800)]
am
c8141407: am
40741e48: am
4cc2bc77: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
c8141407eff4577abae3740bb2a6abf881c6c17c':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Scott Main [Thu, 7 Mar 2013 19:45:38 +0000 (11:45 -0800)]
am
7b21b887: am
3797ec57: am
288099b2: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
7b21b8873f7c511203779710f5791b1b7692f082':