Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove useless line gnome-2-24 NEVADA_112
authordavelam
Mon, 23 Mar 2009 03:11:17 +0000
branchgnome-2-24
changeset 14242 973706ab1db3
parent 14241 e310c64ffb1d
child 14243 29cd23aaf439
remove useless line
ChangeLog file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Fri Mar 20 21:08:05 2009 +0000
+++ b/ChangeLog	Mon Mar 23 03:11:17 2009 +0000
@@ -25,7 +25,6 @@
 	  compiz-by-deafult.  Updates windowmanager gconf key, setting to
 	  compiz-by-default.
 
->>>>>>> .r17874
 2009-03-12  Jerry Tan <[email protected]>
 
 	* patches/gst-plugin-good-02-cdda.diff
sustaining/oi_151a/spec-files