Andy Stadler 28f349bbb0 Merge commit '7a494baf' into manualmerge ...

Conflicts:
	ide/eclipse/.classpath

Change-Id: I0bb9abaef2525b38816f7901f13dd7ddb9167f4b

2012-09-24 17:47:47 -07:00

..

eclipse

Merge commit '7a494baf' into manualmerge

2012-09-24 17:47:47 -07:00

emacs

Merge change I9bdf6690

2009-11-13 15:31:49 -08:00

intellij

Up line width from 80 to 100.

2012-05-24 19:44:00 -07:00

xcode

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00