Palacios Public Git Repository

To checkout Palacios execute 

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute 
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.

projects / palacios.git / commitdiff
? search: re
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fa090b 0956466)
Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel
Jack Lange [Mon, 8 Nov 2010 22:36:19 +0000 (16:36 -0600)]
Conflicts:

palacios/include/palacios/vmm.h

1  2 
palacios/include/palacios/vmm.h patch | diff1 | diff2 | blob | history

diff --cc palacios/include/palacios/vmm.h
index b9c77b5,ee70107..620761a
--- 1/palacios/include/palacios/vmm.h
--- 2/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@@ -216,12 -212,11 +212,15 @@@ struct guest_info
            thread;                                                     \
        })
  
- 
  #endif
  
++<<<<<<< HEAD:palacios/include/palacios/vmm.h
 +
++=======
++>>>>>>> 0956466aad020813d1e470df366d552fdabab2a9:palacios/include/palacios/vmm.h
  /* ** */
  
+ 
  #define V3_ASSERT(x)                                                  \
      do {                                                              \
        extern struct v3_os_hooks * os_hooks;                           \
Public Palacios Development Repository for the V3VEE Project