Merge from dev to master
This commit is contained in:
parent
b791d1d0ac
commit
af1b623660
559 changed files with 273082 additions and 116103 deletions
|
@ -2,10 +2,26 @@
|
|||
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
|
||||
<data xmlns="http://www.netbeans.org/ns/make-project-private/1">
|
||||
<activeConfTypeElem>0</activeConfTypeElem>
|
||||
<activeConfIndexElem>0</activeConfIndexElem>
|
||||
<activeConfIndexElem>1</activeConfIndexElem>
|
||||
</data>
|
||||
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
|
||||
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1">
|
||||
<file>
|
||||
<url>src/osdep/gui/ShowMessage.cpp</url>
|
||||
<bookmark id="1">
|
||||
<name/>
|
||||
<line>98</line>
|
||||
<key/>
|
||||
</bookmark>
|
||||
</file>
|
||||
</editor-bookmarks>
|
||||
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
|
||||
<group/>
|
||||
<group>
|
||||
<file>file:/Users/horaceandthespider/Documents/Geek/Amiberry/amiberry-hats/src/custom.cpp</file>
|
||||
<file>file:/Users/horaceandthespider/Documents/Geek/Amiberry/amiberry-hats/src/include/options.h</file>
|
||||
<file>file:/Users/horaceandthespider/Documents/Geek/Amiberry/amiberry-hats/src/osdep/gui/PanelInput.cpp</file>
|
||||
<file>file:/Users/horaceandthespider/Documents/Geek/Amiberry/amiberry-hats/src/include/inputdevice.h</file>
|
||||
<file>file:/Users/horaceandthespider/Documents/Geek/Amiberry/amiberry-hats/src/cfgfile.cpp</file>
|
||||
<file>file:/Users/horaceandthespider/Documents/Geek/Amiberry/amiberry-hats/src/inputdevice.cpp</file>
|
||||
</group>
|
||||
</open-files>
|
||||
</project-private>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue