2nd try to merge sim_physics with trunk rev 19825
[blender.git] / source / darwin / Makefile
index f7b513fc2146200ff26765a61d0829786790bfc8..b37a4404711a6103dc9a42e4b8c3db45f5261106 100644 (file)
@@ -1,5 +1,13 @@
 #
+<<<<<<< .working
+<<<<<<< .working
+# $Id: Makefile 19805 2009-04-20 00:19:16Z genscher $
+=======
+# $Id: Makefile,v 1.7 2003/05/12 18:12:25 sgefant Exp $
+=======
 # $Id$
+>>>>>>> .merge-right.r19825
+>>>>>>> .merge-right.r19804
 #
 # ***** BEGIN GPL LICENSE BLOCK *****
 #