brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed a <<<< from Changelog

Browse Source
This commit is contained in:
Christophe Fergeau 2002-07-13 19:43:58 +00:00
parent ebb788140a
commit 826a0c4e10
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -105,7 +105,6 @@
* src/common.h: add a grab op for alt+esc window cycling * src/common.h: add a grab op for alt+esc window cycling
>>>>>>> 1.366
2002-07-05 Havoc Pennington <hp@pobox.com> 2002-07-05 Havoc Pennington <hp@pobox.com>
* src/themes/Makefile.am (THEMES): Take Gorilla out until it gets * src/themes/Makefile.am (THEMES): Take Gorilla out until it gets