Merge remote branch 'elliot/cookbook-include-videos'

Browse Source

* elliot/cookbook-include-videos:
  cookbook: Tweak so that videos sit inside a paragraph for better spacing
  docs: Note the P_() macro in the HACKING file
  cookbook: Added support for inline video

Conflicts:
	doc/cookbook/Makefile.am

...

This commit is contained in:

Emmanuele Bassi

2010-07-16 17:13:12 +01:00

parent ae8fe829b6 7d269c6315

commit a3a7a7ebcb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available