[Branch ~ubuntu-core-doc/ubuntu-docs/precise] Rev 71: merging to get get docs currenty

[Jonathan Jesse]

Sorry Matt, thought everything was all synced up before applying the patch

On Sun, Feb 5, 2012 at 10:35 AM, Matthew East <mdke at ubuntu.com> wrote:

> This commit seems to have made a bit of a mess of the branch, with the
> 4 previous revisions being removed.
>
> Please remember to get the latest version of the branch ("bzr up")
> from Launchpad before making changes or merging other branches.
>
> Matt
>
> ---------- Forwarded message ----------
> From:  <noreply at launchpad.net>
> Date: 30 January 2012 20:13
> Subject: [Branch ~ubuntu-core-doc/ubuntu-docs/precise] Rev 71: merging
> to get get docs currenty
> To: Matthew East <matt at mdke.org>
>
>
> Merge authors:
>  Ben Donald-Wilson (benny)
>  Ben Donald-Wilson <benny at touchlay.com.com>
>  Jeremy Bicha (jbicha)
>  Matthew East (mdke)
> Related merge proposals:
>
> https://code.launchpad.net/~benny/ubuntu-docs/fix-for-lp921227/+merge/90007
>  proposed by: Ben Donald-Wilson (benny)
>  review: Approve - Jeremy Bicha (jbicha)
> ------------------------------------------------------------
> revno: 71 [merge]
> committer: jjesse at gmail.com
> branch nick: ubuntu-docs
> timestamp: Mon 2012-01-30 15:08:56 -0500
> message:
>  merging to get get docs currenty
> removed:
>  html/img/bg-content.png
>  html/img/bg-page.png
>  html/img/cap-bottom.png
>  html/img/headerlogo.png
>  html/img/help-about.png
>  html/img/tab_off_ns1.png
>  html/img/tab_off_ns2.png
>  html/img/tab_on_ns1.png
>  html/img/tab_on_ns2.png
>  html/img/u-header.png
>  html/img/ubuntuheader.png
> added:
>  html/img/bg_dotted.png
>  html/img/body_bg.png
>  html/img/bullet.png
>  html/img/dotted.png
>  html/img/error.png
>  html/img/favicon.ico
>  html/img/footer.png
>  html/img/footer_logo.png
>  html/img/header_bg.png
>  html/img/header_logo.png
>  html/img/logo-ubuntu-header.png
>  html/img/logo.png
>  html/img/mainnav.png
>  html/img/news_feed_bg.png
>  html/img/search_button.png
>  html/img/search_button_sprite.png
>  html/img/subnav_active_bg.png
>  html/img/system-shutdown-panel.svg
>  html/img/topnav_active_bg.png
>  html/img/topnav_divider.png
>  html/img/user-offline-panel.svg
>  ubuntu-help/ast/
>  ubuntu-help/ast/ast.po
>  ubuntu-help/az/
>  ubuntu-help/az/az.po
>  ubuntu-help/el/
>  ubuntu-help/el/el.po
>  ubuntu-help/hi/
>  ubuntu-help/hi/hi.po
>  ubuntu-help/kn/
>  ubuntu-help/kn/kn.po
>  ubuntu-help/ms/
>  ubuntu-help/ms/ms.po
>  ubuntu-help/my/
>  ubuntu-help/my/my.po
>  ubuntu-help/pl/
>  ubuntu-help/pl/pl.po
>  ubuntu-help/ug/
>  ubuntu-help/ug/ug.po
>  ubuntu-help/uz/
>  ubuntu-help/uz/uz.po
> modified:
>  debian/changelog
>  html/img/header.png
>  html/ubuntu.xsl
>  ubuntu-help/C/hardware-driver-proprietary.page
>  ubuntu-help/C/session-screenlocks.page
>  ubuntu-help/C/session-smartcard.page.stub
>  ubuntu-help/C/sharing-desktop.page
>  ubuntu-help/C/sharing.page
>  ubuntu-help/C/shell-exit.page
>  ubuntu-help/C/shell-guest-session.page
>  ubuntu-help/C/shell-keyboard-shortcuts.page
>  ubuntu-help/C/shell-net-remote.page.stub
>  ubuntu-help/C/shell-windows-maximize.page
>  ubuntu-help/Makefile.am
>  ubuntu-help/bs/bs.po
>  ubuntu-help/ca/ca.po
>  ubuntu-help/cs/cs.po
>  ubuntu-help/da/da.po
>  ubuntu-help/de/de.po
>  ubuntu-help/en_AU/en_AU.po
>  ubuntu-help/en_GB/en_GB.po
>  ubuntu-help/es/es.po
>  ubuntu-help/fi/fi.po
>  ubuntu-help/fr/fr.po
>  ubuntu-help/gl/gl.po
>  ubuntu-help/hu/hu.po
>  ubuntu-help/id/id.po
>  ubuntu-help/it/it.po
>  ubuntu-help/ja/ja.po
>  ubuntu-help/lv/lv.po
>  ubuntu-help/mg/mg.po
>  ubuntu-help/nb/nb.po
>  ubuntu-help/nl/nl.po
>  ubuntu-help/oc/oc.po
>  ubuntu-help/pt/pt.po
>  ubuntu-help/pt_BR/pt_BR.po
>  ubuntu-help/ru/ru.po
>  ubuntu-help/sk/sk.po
>  ubuntu-help/sl/sl.po
>  ubuntu-help/sq/sq.po
>  ubuntu-help/sr/sr.po
>  ubuntu-help/sv/sv.po
>  ubuntu-help/te/te.po
>  ubuntu-help/tr/tr.po
>  ubuntu-help/ubuntu-help.pot
>  ubuntu-help/uk/uk.po
>  ubuntu-help/zh_CN/zh_CN.po
>  ubuntu-help/zh_TW/zh_TW.po
> The size of the diff (272034 lines) is larger than your specified
> limit of 1000 lines
>
> --
> lp:ubuntu-docs
> https://code.launchpad.net/~ubuntu-core-doc/ubuntu-docs/precise
>
> Your team Ubuntu Documentation Committers is subscribed to branch
> lp:ubuntu-docs.
> To unsubscribe from this branch go to
>
> https://code.launchpad.net/~ubuntu-core-doc/ubuntu-docs/precise/+edit-subscription
>
>
> --
> Matthew East
> http://www.mdke.org
> gnupg pub 1024D/0E6B06FF
>
> --
> ubuntu-doc mailing list
> ubuntu-doc at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20120223/8b4de6a0/attachment.html>