Gitiles
Code Review Sign In
gerrit.collaboraoffice.com / core / refs/heads/feature/slidehack2
commit5cdf5b3f0e52397a6863c030b860abc0eb88a70e[log] [tgz]
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>Tue Jun 24 21:15:06 2014 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>Tue Jun 24 21:15:06 2014 +0200
treed17559332a86894ccccf7037bc4dfa808af24cf3
parent773401ce68387574039f3935b84317128bcef09b [diff]
fix mis-merges

Change-Id: I254a6153936c7b2d649cadabeaa4e4e60984b904
2 files changed
tree: d17559332a86894ccccf7037bc4dfa808af24cf3
  1. .git-hooks/
  2. accessibility/
  3. android/
  4. animations/
  5. apple_remote/
  6. avmedia/
  7. basctl/
  8. basebmp/
  9. basegfx/
  10. basic/
  11. bean/
  12. bin/
  13. binaryurp/
  14. bridges/
  15. canvas/
  16. chart2/
  17. cli_ure/
  18. codemaker/
  19. comphelper/
  20. compilerplugins/
  21. config_host/
  22. configmgr/
  23. connectivity/
  24. cppcanvas/
  25. cppu/
  26. cppuhelper/
  27. cpputools/
  28. crashrep/
  29. cui/
  30. dbaccess/
  31. desktop/
  32. distro-configs/
  33. drawinglayer/
  34. dtrans/
  35. editeng/
  36. embeddedobj/
  37. embedserv/
  38. eventattacher/
  39. extensions/
  40. external/
  41. extras/
  42. filter/
  43. forms/
  44. formula/
  45. fpicker/
  46. framework/
  47. helpcompiler/
  48. hwpfilter/
  49. i18nlangtag/
  50. i18npool/
  51. i18nutil/
  52. icon-themes/
  53. idl/
  54. idlc/
  55. include/
  56. instsetoo_native/
  57. io/
  58. ios/
  59. javaunohelper/
  60. jurt/
  61. jvmaccess/
  62. jvmfwk/
  63. l10ntools/
  64. librelogo/
  65. libreofficekit/
  66. lingucomponent/
  67. linguistic/
  68. lotuswordpro/
  69. m4/
  70. mysqlc/
  71. nlpsolver/
  72. o3tl/
  73. odk/
  74. offapi/
  75. officecfg/
  76. oovbaapi/
  77. oox/
  78. osx/
  79. package/
  80. postprocess/
  81. pyuno/
  82. qadevOOo/
  83. readlicense_oo/
  84. registry/
  85. remotebridges/
  86. reportbuilder/
  87. reportdesign/
  88. ridljar/
  89. rsc/
  90. sal/
  91. salhelper/
  92. sax/
  93. sc/
  94. scaddins/
  95. sccomp/
  96. scp2/
  97. scripting/
  98. sd/
  99. sdext/
  100. setup_native/
  101. sfx2/
  102. shell/
  103. slideshow/
  104. smoketest/
  105. solenv/
  106. soltools/
  107. sot/
  108. starmath/
  109. stoc/
  110. store/
  111. svgio/
  112. svl/
  113. svtools/
  114. svx/
  115. sw/
  116. swext/
  117. sysui/
  118. test/
  119. testtools/
  120. toolkit/
  121. tools/
  122. touch/
  123. tubes/
  124. ucb/
  125. ucbhelper/
  126. udkapi/
  127. UnoControls/
  128. unodevtools/
  129. unoidl/
  130. unoil/
  131. unotest/
  132. unotools/
  133. unoxml/
  134. ure/
  135. uui/
  136. vbahelper/
  137. vcl/
  138. winaccessibility/
  139. wizards/
  140. writerfilter/
  141. writerperfect/
  142. xmerge/
  143. xmlhelp/
  144. xmloff/
  145. xmlreader/
  146. xmlscript/
  147. xmlsecurity/
  148. dictionaries
  149. helpcontent2
  150. translations
  151. .gitattributes
  152. .gitignore
  153. .gitmodules
  154. .gitreview
  155. autogen.sh
  156. config.guess
  157. config.sub
  158. config_host.mk.in
  159. configure.ac
  160. COPYING
  161. COPYING.LGPL
  162. COPYING.MPL
  163. download.lst
  164. g
  165. install-sh
  166. leak-suppress.txt
  167. Library_merged.mk
  168. Library_urelibs.mk
  169. lo.xcent.in
  170. logerrit
  171. Makefile.fetch
  172. Makefile.gbuild
  173. Makefile.in
  174. README.Android
  175. README.Code
  176. README.cross
  177. README.Solaris
  178. Repository.mk
  179. RepositoryExternal.mk
  180. RepositoryFixes.mk
  181. RepositoryModule_build.mk
  182. RepositoryModule_host.mk
  183. TEMPLATE.SOURCECODE.HEADER
  184. unusedcode.easy
  185. unusedcode.exclude
  186. unusedcode.README