mirror of
https://github.com/brl/mutter.git
synced 2025-07-10 04:34:31 +00:00
WARNING: Massive revert commit
Revert all the work that happened on the master branch.
Sadly, this is the only way to merge the current development branch back
into master.
It is now abundantly clear that I merged the 1.99 branch far too soon,
and that Clutter 2.0 won't happen any time soon, if at all.
Since having the development happen on a separate branch throws a lot of
people into confusion, let's undo the clutter-1.99 → master merge, and
move back the development of Clutter to the master branch.
In order to do so, we need to do some surgery to the Git repository.
First, we do a massive revert in a single commit of all that happened
since the switch to 1.99 and the API version bump done with the
89a2862b05
commit. The history is too long
to be reverted commit by commit without being extremely messy.
This commit is contained in:
@ -84,7 +84,7 @@
|
||||
<title>Compiling the examples</title>
|
||||
|
||||
<para>This document comes with full examples, usually stored
|
||||
on disk in <filename><emphasis>datadir</emphasis>/clutter-2.0/cookbook/examples</filename>
|
||||
on disk in <filename><emphasis>datadir</emphasis>/clutter-1.0/cookbook/examples</filename>
|
||||
directory.</para>
|
||||
|
||||
<para>Each example can be compiled using:</para>
|
||||
@ -92,9 +92,9 @@
|
||||
<informalexample>
|
||||
<programlisting>
|
||||
cc \
|
||||
`pkg-config --cflags clutter-2.0` \
|
||||
`pkg-config --cflags clutter-1.0` \
|
||||
-o <emphasis>example</emphasis> <emphasis>example</emphasis>.c \
|
||||
`pkg-config --libs clutter-2.0`
|
||||
`pkg-config --libs clutter-1.0`
|
||||
</programlisting>
|
||||
</informalexample>
|
||||
|
||||
|
Reference in New Issue
Block a user