[macruby-changes] [3239] MacRuby/trunk/sample-macruby/PhileasFrog/build/phileas_frog.build/ phileas_frog.pbxindex/pbxindex.header
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 11 12:38:33 PST 2010
Revision: 3239
http://trac.macosforge.org/projects/ruby/changeset/3239
Author: mattaimonetti at gmail.com
Date: 2010-01-11 12:38:32 -0800 (Mon, 11 Jan 2010)
Log Message:
-----------
resolved git svn conflicts
Modified Paths:
--------------
MacRuby/trunk/sample-macruby/PhileasFrog/build/phileas_frog.build/phileas_frog.pbxindex/pbxindex.header
Modified: MacRuby/trunk/sample-macruby/PhileasFrog/build/phileas_frog.build/phileas_frog.pbxindex/pbxindex.header
===================================================================
--- MacRuby/trunk/sample-macruby/PhileasFrog/build/phileas_frog.build/phileas_frog.pbxindex/pbxindex.header 2010-01-11 20:38:26 UTC (rev 3238)
+++ MacRuby/trunk/sample-macruby/PhileasFrog/build/phileas_frog.build/phileas_frog.pbxindex/pbxindex.header 2010-01-11 20:38:32 UTC (rev 3239)
@@ -1 +1 @@
-xnip! \xFF\xFF\xFF\xFF
\ No newline at end of file
+xnip! \xFF\xFF\xFF\xFF
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100111/09167fff/attachment.html>
More information about the macruby-changes
mailing list