isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed conflict line.

Browse Source 
2007-04-08  Thomas Thurman  <thomas@thurman.org.uk>

        * ChangeLog: removed conflict line.



svn path=/trunk/; revision=3175
This commit is contained in:
Thomas Thurman 2007-04-08 18:17:38 +00:00 committed by Thomas James Alexander Thurman
parent 0a8bdcdcb3
commit 82c56cb5d7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,7 @@
2007-04-08 Thomas Thurman <thomas@thurman.org.uk>
* ChangeLog: removed conflict line.
2007-04-07 Elijah Newren <newren gmail com> 2007-04-07 Elijah Newren <newren gmail com>
* src/prefs.[ch] (screen_bindings array, * src/prefs.[ch] (screen_bindings array,
@ -224,7 +228,6 @@
* src/window.c (meta_window_new_with_attrs): * src/window.c (meta_window_new_with_attrs):
new hooks to handle new atom new hooks to handle new atom
>>>>>>> .r3171
2007-03-26 Josselin Mouette <joss@malsain.org> 2007-03-26 Josselin Mouette <joss@malsain.org>
* src/session.c (meta_session_init): if previous client ID * src/session.c (meta_session_init): if previous client ID