Google Git
Sign in
chromium/external/github.com/GNOME/gtk/refs/heads/upstream/native-layout
commit
54d44a9bd04cfbed8426614fc69c027a46f41a14
[log]
author
Tristan Van Berkom <tristan.van.berkom@gmail.com>
Mon Aug 30 05:56:28 2010
committer
Tristan Van Berkom <tristan.van.berkom@gmail.com>
Mon Aug 30 05:56:28 2010
tree
34bdf65a6e8d5d6d4016154345d1d803ba0da379
parent
b3b22c31b997fb85b3319b392a1a69407703184c [diff]
parent
67194ed77b153eb5a7eb6c596f3c20e274b7787a [diff]
Merge branch 'master' into native-layout

Conflicts:
	gtk/gtkplug.c
	gtk/gtkscrolledwindow.c
tree: 34bdf65a6e8d5d6d4016154345d1d803ba0da379
  1. build/
  2. debian/
  3. demos/
  4. docs/
  5. examples/
  6. gdk/
  7. gtk/
  8. m4/
  9. m4macros/
  10. modules/
  11. perf/
  12. po/
  13. po-properties/
  14. tests/
  15. acinclude.m4
  16. AUTHORS
  17. autogen.sh
  18. ChangeLog.gtk-async-file-chooser
  19. ChangeLog.gtk-printing
  20. ChangeLog.pre-1-0
  21. ChangeLog.pre-1-2
  22. ChangeLog.pre-2-0
  23. ChangeLog.pre-2-10
  24. ChangeLog.pre-2-12
  25. ChangeLog.pre-2-14
  26. ChangeLog.pre-2-16
  27. ChangeLog.pre-2-2
  28. ChangeLog.pre-2-4
  29. ChangeLog.pre-2-6
  30. ChangeLog.pre-2-8
  31. config.h.win32.in
  32. configure.ac
  33. COPYING
  34. gail-3.0-uninstalled.pc.in
  35. gail-3.0.pc.in
  36. gdk-3.0-uninstalled.pc.in
  37. gdk-3.0.pc.in
  38. git.mk
  39. gtk+-3.0-uninstalled.pc.in
  40. gtk+-3.0.pc.in
  41. gtk+-unix-print-3.0.pc.in
  42. gtk+.spec.in
  43. gtk-config-2.0.in
  44. gtk-engine-check-abi.sh
  45. gtk-zip.sh.in
  46. HACKING
  47. INSTALL.in
  48. MAINTAINERS
  49. makecopyright
  50. Makefile.am
  51. Makefile.decl
  52. makefile.msc
  53. NEWS
  54. NEWS.pre-1-0
  55. README.commits
  56. README.in
  57. README.win32
  58. sanitize-la.sh
  59. sanity_check