labofsahil/github-event-dataset-2012 huggingface dataset:
lxc-ubuntu-cloud: get full pathname to userdata file

When passing '--userdata somefile' to the ubuntu-cloud template, a user
may pass a relative pathname.  The template uses the filename after
changing current directory, so store the full pathname for the userdata
file instead of a potential relative pathname.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
parameter and group ui
split class
combobox parameter ui
rename parameter group
string parameter ui and enum parameter ui
add number parameter ui class
tableLayoutPanel
refactory directory
fixed #31 (The slider of morph widget doesn't work)
Include today in graph
core.tab: fix %s macro in empty directories
2005.10.29
clean base and perms
Only admins can see the user:index
auto upload Wed Dec 12 03:52:02 PST 2012
auto upload Sat Dec 29 00:18:56 PST 2012
auto upload Sat Dec 15 19:55:07 PST 2012
auto upload Sat Dec 29 22:10:15 PST 2012
auto upload Wed Dec 19 14:08:45 PST 2012
auto upload Thu Dec 13 21:13:25 PST 2012
auto upload Fri Dec 14 21:38:24 PST 2012
nginx auto index module for mirror.bjtu.edu.cn
Stylus, Nib, Jade
IT Events refactor. JS loading events from google calendar
Merge branch 'calendar_api' into develop
Added fixed data view.
rubyracer added
added site layout
Herstellen des Anfangszustandes nach Exception
fb kinda running
upgrade command-t to v1.4
Update comments with more features
This was annoying me. Now dedicated writeFile function
Oops
Tweak to link colour on monokai
Another GFM thing: don't italicize a_b_c
Update history and bump version numbers
Tweaks and fixes for result types.
Tweak indenting.
Fix definition of void.
Fix argtype definition for rawchar*
Extended the public API with a command to define custom argument types for cproc.
Updated the documentation.
Fixed buglets in the documentation, regenerated the embedded HTML and nroff.
Reporte DIA [Delivered #33813709]
add syslinux to generic sda install target packages
lower row count to prevent test throttling
Made it work on an old version of MinGW GDC.
Now we're starting to have something usable.

- Changed logic to find files. Not yet thoroughly tested (will fail on
  empty extension
- add base_info method for information (if present) in the beginning of
  each file as added by getdata
Now we're starting to have something usable.

Not yet tested!
Added logic to get all data blocks headers, store them for both reading
columns & rendering output.
Get saRdump more generic.

Prepare proper testing of columns headers (& data) loading.
- Put options treatment framework in place
- Document options in pod
- base_info is usable and seems to work
- the rest is not yet
Fixed documentation on mixed lists.  Closes #533.
DocBook reader: Supported bibliography, bibliodiv.
DocBook reader: Skip toc tags.
DocBook reader: Skip index.
DocBook reader: Implemented glossary, simplified sect.
DocBook reader: support more elements.
EPUB:  Set epub3 template variable controlling doctype.
added accordian css
Moving tmux earlier in the zsh boot
Repairs SSH agent after it's gone stale inside tmux.
OS X and Linux have different output formats
Distinguish between completed and important todos
ignore data files, config files, virtualenv
Merge branch 'master' of https://github.com/jquast/x84
this goes away someday, but until then ..
display command arguments to help file not found, etc.s
add environment variable passing, untested really,
remove spurious print
unicodify, also getpos() is causing the spurious __new__ to occur -- get on it ..
add environment support, assert 'pos' timeout parameter, remove cruft
unicodify, take USER env variable and set to handle
big overhaul, esp. cleanup by importing telnet constants from python
telnetlib. otherwise removing some cruft like charset and binary, and
adding support for environment variables.
helped track down thread race conditions of telnet negotions
might give a better idea of whose logging what anyway,
remove charset
add env support
better on-connect negotiation order ?
pos-reply ?
sigh
add $*
Fixing H1 in Readme
Remove extra slash. Filename should include slash.
baseball name change
Worked around NPEs when the activity has been detached
Don't display thread count in thread view
added return statement to wrapper function
source file of custome cursor style

if I have time, I'll change the current "all-black" style to
"silver-lighted" style, just as the system's custom cursor style.
moved *.bat. updated assembly

Signed-off-by: andrey.arnautov <puffdrew@gmail.com>
Adding ignore, package.json, and updated server to length prefixed 20 byte strings.
Uses the query_terms helper in all places.
finding begin and end with functors
finding begin and end with functors
Merge branch 'gen_ions' of https://github.com/kevyin/hfx into gen_ions

Conflicts:
	src/cuda/filter/filter_by_mod.cu
small addition to last commit
removed intermediate valid (candidates) array
fixing extra / in comment
Cleaned up some, added 'dlfcn-win32' library.
file.h: windows doesn't have F_GETFL.
Makefile: trying to get it to compile on windows.
.gitignore: potion.a -> libpotion.a
potion.h: use 'potion_fwd' instead of repeating the code.
Use $(shell ...) instead of backquotes, to expand expression early.
Merge https://github.com/catseye/potion
fixed test
fix merge conflict
Give scripts intended to be executable, executable permissions.
Merge pull request #18 from catseye/master

Give scripts intended to be executable, executable permissions.
Removed readline use. Added linenoise use instead.
ignoration
ignoration
Added build/ and bin/ to the repository.
improved help command to be less strict
switch back to instance with EBS
hta executive file
Renamed gamelogic.clj to logic.clj and bumped to Clojure 1.4.0
changed title to "radar"
insert value's stringified version to history
Convert error()s to deprecation()s

Commit 82ebe03 missed some error() calls that were really
deprecation()s. This patch just convert them as appropriate.
Remove doubly dead code

The removed code is not only dead because the "if" is unconditional, but
also because all the surrounding code is commented out. A future patch
could also remove all the commented out code.
optimization in NodeSetWarnU? functions
change
removed var_dump()
git push
language file updates
update with some useful info
Remove ctrl-p optimizations
Changed default font
Style improvements
ASYNC ALL THE THINGS!

There are two remaining failing tests, but this is because of a conscious change of semantics, rather than an actual bug.
Add WPF SelectFolderDialogBackend
Add WPF OpenFileDialogBackend
Replace some NIEs with TODOs
Add WPF MessageDialog
Add GlobalAlpha property to Context
Make sure the button press event is always handled
Code cleanup for AlertDialogBackend
Properly Save/Restore transforms. Use antialias when drawing.
Add WPF ImageBuilder backend
Fix WPF TextLayoutBackendHandler.GetSize
Fixed pixel alignment in the Canvas widget
added /shrug, removed slashes from alias syntax
Added some bugfixes for display messages
change book list description from string from text
removed unused dec2bin() function
added -n number, to disassembly number bytes of input
the 2048 byte buffer is now a #define LINE_BUFFER
MIFOS-1501: Fixed typo, fixed acceptance tests
MIFOS-5589: Fixed - changed validation for total repayable amount
Merge pull request #106 from jpodeszwik/MIFOS-5589

MIFOS-5589: Fixed - changed validation for total repayable amount
MIFOS-5785: Fixed smart single select questions on view flows
Merge pull request #107 from jpodeszwik/MIFOS-5785

MIFOS-5785: Fixed smart single select questions on view flows
Lots of spelling mistakes
FInal changes before submission
Added DCT
tokyocabinet support hdb and bdb
require thread for mutex
added a pic to the herounit
change to report test to account for hard coded test dates
test edits
more test changes
added a new subproject to seed data
Merge branch 'multiple_mi_plans'
Update ransack
Update selenium-webdriver
update Gemfile.lock after merge
Lei's changes... need to get back to 9 pages
Added line break in API
Whitespace & spelling
moved get_url_informations from models to utils
Merge branch 'master' of https://github.com/prswb/prswb
refactored utils sendmail
Adding a note about code review in the README file
Merge pull request #25 from davidbgk/master

Adding infos about git and code review
i18n markdown pages
added tests for pages at root of MARKDOWN_DIR

poke @davidbgk ;)
removed overengineered defensive programming attempt
let's close file pointers when we're done with them
centered contents
deactivated English language
homepage design and content modifications + contact page content
conflict on layout.html resolved
changes on homepage
added title and description from the wording
form styling
login page template
registration form templating
suggest a site page templating
merge with master
Error reporting fix. New context option to inline all includes
設定ファイルにPORTを追加
UVa 10038 - Jolly Jumpers
QUnit&Sinon tests are improved!
Developping DavStorage.
Add hal_collection_builder
Merge Sigma/Master + Updatable Controll Full Utilities
Templates Generated + HContainer Anidados + HTML to Append AND CleanUp
Changes in style.css and addition to the footer
Changes in style.css and addition to the footer
search basically works, figuring out how to get it from the navbar
Merge branch 'master' of github.com:noeleo/cet
Merge branch 'master' of github.com:noeleo/cet

Conflicts:
	app/views/_navbar.html.erb
	app/views/schools/show.html.erb
Increasing default left and right margin on sparklinePlus to prevent hover value from being clipped
Fixed issue with new line implementation where getX and getY don;t trickle down to the scatter
Fixed problem with y pos and height calculations with groups/stacked bar chart
chirp add
permutations.clj: added Resumable implementation for BacktrackingGenerator
RS 05 Aufgabe 4 c,d.
Merged.
Fix pagination when autoHeight and store throws exception during fetching
Add method into interface to retrieve shema information
add subscribe_once
Use debug utils.
Move gnulib into its own library subdir.  Add ACX_CONFIGURE_DIR.

v2 - include build-gnulib/config.h instead of build-gnulib/../config.h

2012-04-16  Pedro Alves  <palves@redhat.com>

	* Makefile.in (GNULIB_BUILDDIR, GNULIB_CFLAGS): New.
	(INCLUDE_CFLAGS): Add $GNULIB_CFLAGS.
	(LIBGNU, INCGNU, GNULIB_H): Adjust.
	(XXX): Adjust.
	(SUBDIRS): Add $(GNULIB_BUILDDIR).
	(CLEANDIRS): Remove gnulib.
	(REQUIRED_SUBDIRS): Adjust.
	(all-lib): Adjust.
	(distclean): Remove the gnulib build directory.
	(gnulib/Makefile): Adjust.
	(ACLOCAL_AMFLAGS): Remove gnulib/m4.
	(aclocal_m4_deps): Remove gnulib dependencies.  Add
	acx_configure_dir.m4.
	* acinclude.m4: Include acx_configure_dir.m4.
	* configure.ac: Remove gl_EARLY, gl_INIT and AM_INIT_AUTOMAKE
	calls.  Configure gnulib using ACX_CONFIGURE_DIR.
	(GNULIB): New variable.
	(GNULIB_STDINT_H): Adjust.
	(AC_OUTPUT): Don't output gnulib/Makefile.
	* gdb/defs.h: Include build-gnulib/../config.h.
	* acx_configure_dir.m4: New file.
	* aclocal.m4: Regenerate.
	* config.in: Regenerate.
	* configure: Regenerate.

	* gnulib/: Move directory ...
	* gnulib/gnulib/: ... here.
	* gnulib/Makefile.in: New file.
	* gnulib/configure.ac: New file.
	* gnulib/aclocal.m4: New file.
	* gnulib/config.in: New file.
	* gnulib/configure: New file.

	gdbserver/
	* Makefile.in (GNULIB_INCLUDE_DIR): Delete.
	(GNULIB_BUILDDIR): New.
	(GNULIB_CFLAGS): New.
	(GNULIB_LIB): Adjust.
	(GNULIB_H): Adjust.
	(INCLUDE_CFLAGS): Adjust.
	(SUBDIRS, CLEANDIRS, REQUIRED_SUBDIRS): New.
	(all, install-only, uninstall, clean-info, all-lib, clean): No
	longer pass GNULIB_FLAGS_TO_PASS.  Use subdir_do.
	(maintainer-clean realclean distclean): Use subdir_do.
	(subdir_do): New.
	(gnulib/Makefile): Adjust.
	* acinclude.m4: Include acx_configure_dir.m4.
	* configure.ac: Remove gl_EARLY, gl_INIT, and AM_INIT_AUTOMAKE
	calls.  Call AC_PROG_RANLIB.  Configure gnulib using
	ACX_CONFIGURE_DIR.
	(GNULIB): New.
	(GNULIB_STDINT_H): Adjust.
	(AC_OUTPUT): Don't output gnulib/Makefile anymore.
	* gdbreplay.c: Include build-gnulib/../config.h.
	* server.h: Likewise.
	* aclocal.m4: Regenerate.
	* config.in: Regenerate.
	* configure: Regenerate.
complite fully blue skin feature
Zend CMS  build by book Forrest Lyman

Complite Chapter 3 : Building and processing Web forms with Zend_Form

Added:
Bug reporting form via MVC.
Stylesheet form.css appended for blues style.
Classes/MySQL: createDB Funktion
Tanjas Beispiele
add visualization
merged axes. soooo sorry to have not pushed before :(
Remove unused built-in function Yield(...).
Improve test coverage of type checking for If, Block, and VectorLiteral expressions.
Improve test coverage for Interpreter.
whatever.
improve comments in the multiprot example
fix the django example by wrapping the DjangoApplication instance in csrf_exempt decorator instead of the rpclib service definition.
fix the argument order in Application instantiation in test.interop.soap_http
remove absolute imports.
separate http and wsgi handlers.
the initial revision for a twisted.web.resource.Resource wrapper server transport for rpclib.application.Application.
Use a new evaluaor in "for.scrbl", have it require `racket/base' for syntax.

Also explicitly close the evaluator used in "block.scrbl".

Closes PR 12931.
(cherry picked from commit 476c270a66c594d1da8d778f299b2aa0fd682015)
fix bug in inline code

merge to the release branch, please
(cherry picked from commit 519b69362f54522542b62bf6658360df62baef8f)
increase timeout for the sharing modules drracket test case
(cherry picked from commit d282843116664c32187f62527b5f3acb857347e2)

Conflicts:
	collects/meta/props
Fix future visualizer trace collection when running inside DrRacket
(cherry picked from commit df54f8460b0d053227eca9475c7ee561afd99631)
Add unit tests for future-visualizer/trace
(cherry picked from commit 5214995967684595a628275ada33e41c4e2cd86e)
Minor changes to future-visualizer/trace tests
(cherry picked from commit e4f50997ad9a0bbf2ee3c17c967ae76c09667cbc)
Change future visualizer trace collection slightly to be more composable
(cherry picked from commit f0aaca0dde8b2f7376ced7e0e74f0bd352f35fda)
Performance improvements in future visualizer GUI (dragging, scrolling, sizing)
(cherry picked from commit 06358fa19d5d8b93c9878f07cb8a7e726839955e)
Fix "dancing flags" issue with timeline ticks in future visualizer
(cherry picked from commit 6eed135d023755d4afc9d01430d9c711f878d9bf)
Improvements to mouseover performance in future visualizer
(cherry picked from commit b6c4bece11058864d776e50efabb49659d65a905)
Fix minor display issue in event details panel (future visualizer)
(cherry picked from commit ee426f7ecb762c8ac519bb1c8290391c28955a1e)
Future visualizer - only redraw overlay when moused-over event changes
(cherry picked from commit 0b8bccc8d4cbeba6e3b5a9a413cd066c27da33fb)
Fix future visualizer drawing outside visible area (in y dimension)
(cherry picked from commit 5042b73fc89df2c66474a391efcc8443e5ae4524)
Future visualizer performance improvements
(cherry picked from commit 0b5d574aae05de4643864f05574307b07b0c756e)
Future visualizer - more performance improvement
(cherry picked from commit 1355c711a87ad9f12ef16c0232e9736cceaa6492)
Fix block/sync counts in future visualizer and per-future block counts in creation graph mouseover
(cherry picked from commit 087ec3890c4fe1701839e2120aa5fba7ca4eb69e)
Add test to track performance of code inside a future over time
(cherry picked from commit ca360cdaedc6d87a069d6cc41756622d941c29e6)
fix `syntax-local-get-shadower' for submodules

Closes PR 12926, 12928

Merge to v5.3
(cherry picked from commit a0ba30d8e7c16fbd572856ea950e82d98ccca4be)
errortrace: fix profiling for phase >= 2 code

Closes PR 25050

Merge to v5.3
(cherry picked from commit 05495764ea51260710fd3a976c93a7eb58b0acb4)
fixed small mistake in defform/none from conversion to syntax/parse

merge into v5.3 but ask Matthew for second opinion
(cherry picked from commit bf8c30727d4cb8def581f63e43cb79a1111ad8ff)
New Racket version 5.3.0.4.
fix send files when drop to roster
DF#QCADOOMES-961 fixed: QueryException when generating order report
RF# add logdigger persistance
RF# add logdigger persistance
SC#QCADOOMES-1012 Added listener for updating conversions on grid.
Merge branch 'master' of github.com:qcadoo/mes
DF#QCADOOMES-790 Wrong polish translations and formats in cost calculation report - fixed
oops, broken registration
LVM: in resize, use whole lvm device name to match the other hosts
make compareVersions compare also java versions
fix adding and removing orders and cols to resource sets
adjust tests
hardcode map id 1 to homepage
Navigation menu work
Panels can be reordered in code, ready for dynamic reordering
Only run console if we have some code in the js panel
Support .js and .css, etc
Added reveal.js
Merge branch 'gh-pages' of https://github.com/remydb/ssn into gh-pages

Conflicts:
	index.html
Fixed a bug in handling of observable events.

also
- print vertex ids when logging
- switched to StringBuilder (the new variant of StringBuffer, both were
  used)
- reused pp_event_type when constructing event names
- added test twoprops
person location
TextureAtlas/Sheet now auto distributes to Texture2D
- saves us lazy guys one line of code
- minor cleanups
fix getting CMAKE_PREFIX_PATH from environment
Catch invalid paths in ROS_PACKAGE_PATH
BIGTOP-750. Bump Zookeeper to 3.4.5
lua: icecast: fix syntax
Qt: correctly fallback to filename when empty tags
Merge branch 'master' of git://git.videolan.org/vlc
addressing amits comment
Merge pull request #9 from deian/gates

 addressing amits comment
no mainwindow
no mainwindow
Range fixes
opera fix
Range fixes
opera fix
ie range selection fix
Merge branch 'master' of git://github.com/jerrymf/JAK
old IEs range fixes
Merge branch 'range'
Merge pull request #34 from jerrymf/master

Fixes
statuscolors
final release 1.1
Changed to 24*24 hexagons
Merge branch 'master' of github.com:sigvef/sol
Added hexagon blinking, reduced hexagon count
Improved blinking, extended test midi file
global import addition
[fixes #38429131] Prevent admin from merging duplicate with responses with target without responses
Inserita galleria immagini nel front end
Messages, exchange and buildings module.

Just concept of some important modules.
  Post - for sending messages between players
  Exchange - for offers and demands, bids, etc.
  Building - Buildings and constructions player can build.

TODO: Unittests! Refactoring.
removing redundant closed? check
Changes for Job detail and Candidate Detail
changes for Jquery slect Box
xombrero: add current tab number to status bar
started working on my ks.cfg standards
added writer-snippet id=330 v0.1 from http://rubyforge.org/snippet/detail.php?type=snippet&id=253
Neueste Version von http://pastebin.com/N4sf6Dnh mit Iconv
primitive test works
put the code into the class
First Adaption to DBF::Table
introduced DBF::Column into WriTable class
added capability to use existing column defs
Simple modifications of Records now possible
wade tests independent of the current date
For some reason, @data.rewind was needed. And splat is needed for Hash#[] in Ruby 1.8.6
xmonad: Get XMonad's Prompt to ignore consecutive duplicates.
vim: Update ctrlp ignore rules for new hsenv format.
zsh: Remove parens in LS_COLORS.

Aparently, the parentheses _do_ matter, as they break LS_COLORS inside
screen/tmux.
x: Disable the bell when inside X.

Rule of thumb, in addition to this change:
    * Disable the pcspkr module in the kernel blacklist.
    * Set the bell volume to zero in alsamixer.

Now, hopefully, the bell will not sound.
tmux: Revert the tmux $TERM to the recommended setting.
tuning: lib/pg_activity.sql

Signed-off-by: Sylvain Rabot <sylvain.rabot@f-secure.com>
pgtop: help improved

Signed-off-by: Sylvain Rabot <sylvain.rabot@f-secure.com>
pgtop: add test for required binaries

Signed-off-by: Sylvain Rabot <sylvain.rabot@f-secure.com>
pgtop: split getopt invocation

Signed-off-by: Sylvain Rabot <sylvain.rabot@f-secure.com>
Added peer thread
Proto type cache
add Atom_aload, Atom_vload, Atom_free, Atom_reset, Atom_map to the Atom interface
Fix dae on article. Update photos for arduino watering system
Added some W5200 (WIZ820i0) examples
avance parcial cuda
change project structure & add cmake
quiz 10 + 11
magic 8 ball plugin.

Try to ask some questions, the bot will respond with a response
to help you with your decision. You can also trigger it by
simply issuing the !8ball command.
Merge pull request #16 from winged/feature-8ball

magic 8 ball plugin.
Refactor Static and add existing dir index support.
add db.c
Merge branch 'master' of https://github.com/trvra/db.c
Revert "formularz"

This reverts commit ab8b8f2e2e11b3e8aa11ca1c728e789f6133eebb.
merge entre le projet JPA et le projet JEE
Merge branch 'master' of https://github.com/tuxerr/J2E
Added another IDE file to the ignore list.
Feed: enhanced icons
Unit tests: Fixed undefined xAuth username, set to 'unit-tests'
Merge branch 'release-1.1' of github.com:unil/iafbm into release-1.1
Renamed project tests/ directory to unittests/
Added orthographic projection to matrix4
Accessor for Scene params
Scene node render now receive projection and modelview matrix as
parameters
2012-04-22_11:23:10
set user default success
ccaction success
do game clean success
little changes and update smart-mark.el
refactor
add README.md and refactor
Changing element figures.

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@145313 a5903396-d722-0410-b921-86c7d4935375
Adding EJBMediator deserializer

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@149779 a5903396-d722-0410-b921-86c7d4935375
doxgen -- v0.5.3
Fix the incorrect abstraction over holes.

This caused:

f x = _

To get the type:

f :: t1 -> t -> t1

Now it's:

f :: t -> t1

As it should.
update examples so they work
foto e aprovar foto
rolagem infinita
HIVE-3515 metadata_export_drop.q causes failure of other tests
(Ivan Gorbachev via namit)



git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1391848 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk
added "node" to metadata in parse transform
Fixes #40 - Parse and use package.json if it is located
Removed extras from yuidoc.json to use from package.json
Removed yuidoc.json version writing
Moved from yuidoc.json to package.json
Fixed order of mixing from package.json
Removed yuidoc.json from source
Docs
To find a tree is Symmetric
Merge branch 'master' of https://github.com/yw229/Tree
On the charity table, the selected button now says "Charity Selected" and the confirmation message writes the charity name
pre compiled assets;
Initial package support
gyp should be executable
added some storage/logging fixes and cleanup. added dump handler
Added TODO
Added gitignore
Added hi_trace
Fixing home page alignments.
Specs cleanup
Merge branch 'next' of github.com:zhdk/madek into next
Preparing the base for Featured thumb section items.
Fix a test and make testing a bit less relaxed.
wip: expressions
droid sans mono, repl style to CSS
better error message for LET mistakes
autoexplain settings, according to fashiolista
the problem I don't have great ideas about at this point: allocating arrays of eventconfigs without doing 2 passes to find out how many configs are needed and then iterate over them and generate them. anyway the plan right now is basically to make an array of eventconfigs in opera::opera() then make an array of the same size of events, and iterate over the configs to instantiate all of the events. this should result in having a operaEvent instance for each character/stage/narrator event, in arrays that can be iterated over every beat. note: the yaml files as examples right now are missing a few fields that can be seen in operaEvent.h: operaEventConfig. anyway, the other thing that definitely needs to occur is to take the identical lists of events for characters and have each event load the proper oggFolder and named events. the point is, check a bitmaskAND and a  bitmask NOT and then play the event if need be.
Merge branch 'alpha' into opera
Merge remote-tracking branch 'upstream/opera' into opera
Why does this error keep showing up?
Ghost rework
Well, let's see if this is too broken
No idea why that existed
Made inputs private. This way a hypothetical headless player-driver instance will not inherit them
Merge branch 'alpha' into opera

Conflicts:
	src/engine/action.h
	src/engine/interface.cc
	src/game.cc
pared these down to something testable. compiles and runs now, not that that's saying much
did a simple test and parsing in values works now
examples to load in an operaEvent
pretty simple right now, but hey it works
operaEvent class can currently parse in a config file and load an ogg, and play it. now need to define the check, grow, and decay functions. then the individual events should be ready to call with method check, every frame. then opera.cc can be written to allocate channels, initialize all events from configs/audio, and check all of them whenever beat() is called
operaEvent class can currently parse in a config file and load an ogg, and play it. now need to define the check, grow, and decay functions. then the individual events should be ready to call with method check, every frame. then opera.cc can be written to allocate channels, initialize all events from configs/audio, and check all of them whenever beat() is called
Merge branch 'opera' of github.com:h-forrest-alexander/GUFG into opera

Conflicts:
	src/opera/operaEvent.cc
Merge remote-tracking branch 'forrest/opera' into opera

Conflicts:
	src/engine/action.h
	src/engine/interface.cc
	src/game.cc
More attractor stuff
Added info string into status bar
Added OpenCV FFMPEG .dll file.
Extend OFD's video file filter with supported popular video formats
Removed unnecessary dock widget
Add Ep.03 - Ep.07
No backup on Windows
Added Gamecore lib
- C++ code: use MAXPATHLEN for char arrays that hold paths


git-svn-id: http://boinc.berkeley.edu/svn/trunk/boinc@25659 677681c0-c3c0-48b4-bd46-92119ef6d97a
- another MAXPATHLEN


git-svn-id: http://boinc.berkeley.edu/svn/trunk/boinc@25660 677681c0-c3c0-48b4-bd46-92119ef6d97a
- compile fix


git-svn-id: http://boinc.berkeley.edu/svn/trunk/boinc@25663 677681c0-c3c0-48b4-bd46-92119ef6d97a
- compile fix


git-svn-id: http://boinc.berkeley.edu/svn/trunk/boinc@25664 677681c0-c3c0-48b4-bd46-92119ef6d97a
- Win compile fixes


git-svn-id: http://boinc.berkeley.edu/svn/trunk/boinc@25665 677681c0-c3c0-48b4-bd46-92119ef6d97a
    - lib: Fix a bug where information that was meant for stdout was
        being written to stderr instead.
    - lib: Keep track of the rough estimate of stdout and stderr by
        incrementing internal variables instead of doing a stat on
        each log write.  stat() on Windows is converted to a FindFirstFile()
        call which in turn looks up the file size information in the
        directory structure file system entry.  The directory structure 
        information is only updated periodically.  This lead to larger
        than expected log file for both the manager and core client.
        
        This has the added advantage of reducing the overall number of
        file I/O operations when logging information.
        
    lib/
        diagnostics.cpp


git-svn-id: http://boinc.berkeley.edu/svn/trunk/boinc@25666 677681c0-c3c0-48b4-bd46-92119ef6d97a
MGR: Eliminate QuickDraw calls for OS 10.8 compatibility

git-svn-id: http://boinc.berkeley.edu/svn/trunk/boinc@25667 677681c0-c3c0-48b4-bd46-92119ef6d97a
Emergency bug fix.
Bump version.
stats, and basic cart 1
modal-arrow & coffee mug
Merge Benedikt Appointments etc
Initial commit for models
Symbolic link to README.
attempting to make EX_MEM changes noticeable so that merge includes them
Merge branch 'Integrate_MEM_WB_Reg' into Pipeline-F-H

Conflicts:
	Controller.v

Merge fix trying to merge MEM_WB register with current work
More fixes
More fixes
added BranchFlush and JumpFlush control signals
Merge branch 'Pipeline-F-H' of https://github.com/Caskman/369 into Pipeline-F-H

Conflicts:
	Controller.v

Merge with remote to fix earlier revert
asas
Merge branch 'master' of github.com:ConcoMB/HCI

Conflicts:
	TPE3/src/header.html
Fix the file format for all files (using find and touch)
lesser sync update
and i will calmly remove that infuriating automatically added linebreak from use of an inferior editor
Added some documentation about the jobs, and changed the wordage of the status messages on the queue items.
Merge branch 'ra' of github.com:Doula/Doula into ra
Made it possibly to easily transfer the QueuedItems module to a new page.
fix for commented out job
Fixed tests for searchLayeredNode. Fixed validation for addNodeTemp.
增加头部插入数据
add the test for git clone of n several pages
Set the server temp dir to cache_dir if specified, this is a feature for shared hosting environnements
suite du bootstrap
agregando estilos
agregando el estilo al layout
aplicando los estilos en el login
pulling
Merge branch 'master' of https://github.com/Hajfajf/YDD
email template + signup revised
new file:   enshuu11.c
	new file:   enshuu12.c
	new file:   enshuu13.c
	new file:   enshuu14.c
	new file:   enshuu15.c
	new file:   enshuu16.c
	new file:   enshuu17.c
	new file:   enshuu18.c
	new file:   kadai1a3.c
Use xrange instead of range in Image init
Improving taskmanager.
Remove prints from image, add __str__
Improve scenetask, eg. add __str__
Fix rest, add commandline interface and so on.
Check git work, second commit
Final
Final_2
STYLE:  Remove refernces to itkTestMain.h

The itkTestMain.h file is no longer in ITKv4.
All references to this file have been removed.
It was not intended or maintained for external re-use.

Change-Id: I220e49453e0be1c1b360d0339d877c0688d06a01
Merge topic 'RemoveRemainingitkTestMainReferences'

496f7ff STYLE:  Remove refernces to itkTestMain.h
COMP: WrapITK: removed Denosing, matching dim for ObjectToObject

When WrapITK was being compiled with explicit instantiation turned on,
the linker was getting and error because the following library was not
being generated ITKDenoisingExplicit.

Additionally, the ObjectToObjectMetric currently only compiles when
the moving and fixed dimension match, due to requirements of an
identity matrix for initialization.

Change-Id: I35e19e095aa23f21d7cef4cdd7d8460ac91d5f85
Merge topic 'FixWrapITKExplicit'

31389da COMP: WrapITK: removed Denosing, matching dim for ObjectToObject
KWSys Nightly Date Stamp
BUG: Fix out of bounds access during PrintSelf

Change-Id: Ifd91363d89e7495a1ea075765be2709cee602f98
Merge topic 'FixValgrindPDEDeformableRegistration'

bd56364 BUG: Fix out of bounds access during PrintSelf
COMP:  Address comp. warnings (int <-> double)

Change-Id: Icef6876090c7d32fcb9961587c42e8181b2a21b9
Merge topic 'RegistrationCompWarnings'

1840f12 COMP:  Address comp. warnings (int <-> double)
vtkUniformGridAMRDataIterator: Fix a bug for empty AMR

This used to crash for an empty AMR with no data. Added tests as well.

Change-Id: Ie9111c6c43b2adc1b7ff0bd799cd717ad7c74ea0
Merge topic 'fix-amr-iterator-bug' into master

f865eaeb vtkUniformGridAMRDataIterator: Fix a bug for empty AMR
Add aggregate detection.
Envoi du tableau blanc aux apprenants
Affichage de la caméra vue apprenant
Scroll utilisable sauf pour le canvas
added validation and some listeners
Changing the deployment target from 10.8 to 10.6
Newest version in symbios with NocturnalGaming
Newest
Changed CHTMLPurify
Svar på dina frågor

Jag hade svarat på din frågor på github som kommentarer men du kankse
har missat det så jag gör så här istället.
RecursiveASTVisitor: add ability to visit implicit declarations. Patch by
James Dennett!


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158002 91177308-0d34-0410-b5e6-96231b3b80d8
Reapply "Only emit debug information for methods that are user defined, there's"

As the failing testcase has been fixed.

This reverts commit 0637f407e6ee7fdccde17fbf9a5fcc4853187b3e.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158009 91177308-0d34-0410-b5e6-96231b3b80d8
Fix a bug with va_arg and vectors on Darwin x86-32.  <rdar://problem/11592208>.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158017 91177308-0d34-0410-b5e6-96231b3b80d8
Fixes the refactoring library test in VS2010.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158019 91177308-0d34-0410-b5e6-96231b3b80d8
objective-c: merge deprecated/unavailable attributes to
the overriding deprecated/unavailable method.
// rdar://11475360


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158022 91177308-0d34-0410-b5e6-96231b3b80d8
PlistDiagnostics: force the ranges for control-flow edges to be single locations, forcing
adjacent edges to have compatible ranges.  This simplifies the layout logic for some clients.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158028 91177308-0d34-0410-b5e6-96231b3b80d8
A non-explicit constructor template with a second parameter that is a
parameter pack is a converting constructor. Fixes PR13003.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158040 91177308-0d34-0410-b5e6-96231b3b80d8
Disable path pruning for UndefResultChecker.  It turns out we usually want to see more of the path
to discover how a value was used uninitialized.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158048 91177308-0d34-0410-b5e6-96231b3b80d8
Introduce -Wunused-private-field. If enabled, this warning detects
unused private fields of classes that are fully defined in the current
translation unit.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158054 91177308-0d34-0410-b5e6-96231b3b80d8
Zap the /Za compiler switch from MSVC projects, the option is considered harmful even by Microsoft people and clang won't build using the MSVC 2012 RC if not removed.

Only 1 minor code change was necessary: can't use cdecl as variable name anymore.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158063 91177308-0d34-0410-b5e6-96231b3b80d8
Add -fobjc-direct-class-refs.

This options allows referencing classes directly when using the GNU ABI.
Clang already emits symbols for all classes and with this option, it is
actually possible to use those. This is tested with my own runtime, the
ObjFW runtime, and should also work with the GNUstep runtime.
rm logs from git
Lab #2

Signed-off-by: Alexandr <mogost@gmail.com>
Adding pools and configuration. Pool has some issues, config is still unreviewed.
E2: Added keyDuck, keyLeftTurn/keyRightTurn (not bound by default) (#91)
Laserpointer: Picking it up should properly initialize now
SWEP:Equip is only called serverside, SWEP:Deploy is what we want
Fixes #87
Made gmod_tool_auto's sanity check saner
Fixed wire_adv occasionally throwing errors about activeWep:GetMode() being nil
Merge pull request #101 from Nebual/master

Stool Uniformications
Updated I/O Tools MakeEnt functions to the newer, shorter, syntax
Changed Detection Tools to use WireToolSetup.SetupMax
trtrtr
tr
Add options for specifying binary caches
nixos-rebuild: Handle options with spaces in them

Like ‘--option binary-caches "http://foo http://bar"’
Kill the backdoor more forcefully

Otherwise it hangs until the 90 second timeout expires.

http://hydra.nixos.org/build/3253068
Test driver: Don't wait for a reply after issuing "poweroff"
Fix coverage data collection

http://hydra.nixos.org/build/3253046
Initial version of a SpamAssassin service.

The configuration is expected to be managed by the user in /etc/spamassassin.
Fixed some stupid bugs which were so easy to see if I only tested more...
Removed doctrine/orm dependency
New methods for DallasTemperature
adding sigar
Fixed client/main.py
gestion des premiers droits
Merge branch 'master' of https://github.com/PyroXn/ccas
Re #237: [migrate] Модель для хранения стилей.
Re #237: [migrate i18n] Мультиязычность для стилей проекта.
Re #237: [migrate] Инлайны для стилей.
Re #237: Совместное взаимодействие механизмов сортировки.
Re #237: Отображение стилей.
Asynchronous refactoring.
este.dom getDomPathIndexes and getElementByDomPathIndex
form persist initial
forms persister
…
+++ верстка "Файловый архив"
catalog search
Merge remote-tracking branch 'master/master'
Add cached methods
Merge remote-tracking branch 'origin/master'
Fix `copyright` (once and for all)
Improved Makefile
Merge branches 'master' and 'collision' into collision
Fixed IPL5
lol
conky
Created start menu
Correct file

Uploaded correct files for upcoming ASD Class. Originall synced older
project files
N movie capture
changed image to reflect new capturing options
updated alias list to include new variable names.
Fix: er stond een \end{frame} teveel???
Plaats van samenwerken veranderd
Fixed workaround for LESS to exclude burningBoard.css
Culling überall angepasst, wenn jemand noch irgendwo nen
OFFSET parameter versteckt hat, bitte melden ^_^
10.15

text update
lisätty fest-kirjasto
use $GIT
add some whitespace
Update dazzle.sh
Merge remote-tracking branch 'upstream/master'
Merged with upstream changes from original repo

Conflicts:
	dazzle.sh
Allow sudo to call script
fix crash with session user
README fixup for blockquoting output
added multiAxisLineChart model
merged multiAxisLineChart
Updated scr/models/axis.js to accept a rotateYLabel parameter (because not all axis labels should be vertically oriented). nv.models.axis() now also accepts a margin parameter.
fixes bug that messes up tooltips when you have multiple graphs on one page
Removed rendering timers when development is off. Other small fixes.
Minifying Pull Request #94
Merge remote-tracking branch 'g2010a/patch-1'
minifying Pull Reqquest #85
Merge remote-tracking branch 'deleet/master'
Some minor tweaks and minifying Pull Request #95
Mergin in changes, and some updates to historicalBar and ohlcBar models
multichart model that can handle Stacked, Line, and Bar charts across 2 axes
Merge branch 'master' of git://github.com/novus/nvd3 into multiChart
refactor how scale is used now that I kind of understand it
getting tooltips and legend to work
added two utility functions for color
use new color getting method in everything that's used in a stackedAreaChart
add reference to utils.js to make new color picking work without compiling
include an example of ensuring same labels get same colors in two graphs
add utils.js dependency to examples to avoid having to compile while developing
update models to use new colors
crude fix to broken y axis handling in sparklinesPlys
content is an arg in STORE, be careful with whitespace!
english paper templates, first try
fancyhdrs
ignore pdfs except in intro/
Merge branch 'master' into english_paper
First full version of XeTeX English paper
and a template readme
Corregimos el titulo
bugfixes, changed graph data structure
tests for brute force knn solver
Webrick to Thin
medialibrary: Use the horizontal ellipsis unicode character
Modified completion; add img_uuid completion
merge lambda and function syntax, setup for auto forall quantification
Readme expansion.
change in Tab page link
Do not force vnode revoking

This leads to 'reclaim in progress' kernel panics. Kernel might
reclaiming this node in other thread.

In fact we should not use vn_revoke directly, all we need is to
manage vnode usage counter correctly and kernel reclaim vnodes for us.
Inline fuse_internal_vnode_disappear()
Use maximum io size as default

64K io size used before is a bottleneck for sshfs on fast local networks.
We should use larger io size to reduce number of context switches and
improve copy performance. Use maximum io size by default.

Set maximum io size to 32M on macosx 10.7 and 16M on previous versions.
10.6 and earlier had a bug that leads to resource leaks and panic in case
of large upl buffers.
Reverted som styling gone wrong
Cleanup after mode locks, badwords, akick, access, if destructed
Fixed issue in reading cached data for instances where task completed before call to RunAsynchronously and resulted in swallowed exception.
HIVE-3794 : Oracle upgrade script for Hive is broken (Deepesh Khandelwal via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/branch-0.10@1423482 13f79535-47bb-0310-9956-ffa450edef68
Added mongoid_session_store to Gemfile and set Rails session_store to use mongoid instead of cookies.
modefied
create fixture:customers
rake db:fixtures:load FIXTURES=customers
Update clojure tools.
Add slime-repl to the package list.
Add a yed wrapper.
Add lein and lein2.
Add the means to install lein2.
Use the flag -y.
Add auto-complete and clj-doc packages.
Remove comments as they prevent from evaluating the emacs lisp.
Load emacs with a theme depending on the luminosity of the place (light, dark, grey).
made nextup work for playlists with more than 10 songs
Added HW1 - finished
Add Colonnisation gamemode
Added infinity as a possible time value
pw.vim colorscheme fix for minibuf explorer, nasm and highlight semicolon
use hunspell instead of aspell
doc about debugging lisp source code
cleanup and add some more tests
extended CssColorConverter
Adding a and b files
Added python DOT 2 and 3 layer examples. Added Cuda awareness to cmake files
Merge branch 'master' of github.com:bempp/bempp
Ensured that the root of AHMED's block cluster tree gets pointers to clusters.
Changed default maximumBlockSize and maximumRank from UINT_MAX to INT_MAX.

It looks like the previous defaults caused problems in some cases due to
signed <-> unsigned conversions.
Ensured that G77CONVENTION is properly defined
in any files including AHMED's blas.h.
Patched the CMake scripts to detect the G77 calling convention,
even if the user does not do a fresh 'git clone'.
Bumped up version number and edited README.
Corrected a bug in importing subprocess.check_call in Python 2.6.
When updating, the installer will now be restarted after 'git merge'.

This allows us to fix bugs in the installer itself.
Corrected the call to os.exec*() in checkInstallUpdates().
Modified the command used to restart the installer.
Revert "Patched the CMake scripts to detect the G77 calling convention."

This reverts commits 0dce85c4f7e5eeeea20463323d061830e91d2d6f and
b29050deaac25abf549de7262388c830fd39c10b.

The CMake patch turned out to be unnecessary (if AHMED is installed with
the BEM++ installer, its header files are automatically patched to include
G77CONVENTION as appropriate).

Conflicts:

	lib/common/config_ahmed.hpp.in
Updated date of the 1.0.1 release in README.
If --resume-update is present in installer's command line, the installer
now terminates immediately after completing the update procedure.
Removed a leftover "print" statement from installer's code.
Edited release notes.
Close #284
шаблони за формата за местене
Change layer data format with an undo command

Makes sure the map is marked as changed, so that the user is prompted
when forgetting to save this change.

Also moved the different formats enum from MapWriter to Map.

Fixes #307
Fix tileset zooming

Adding support for various tile sizes in a tileset broke
Ctrl+scrollwheel zooming because the zoom level was ignored.
This fixes the regression.

Fixes #278
Added python and C indentation rules
fixed it!!! the triangle now shows up!!! yay!!!
aligned writeGLErrors with the actual glGetError implementation (facepalm)
fix solaris studio compilation
Fix IE bug where multiple click to dial icons would appear in contact list view.
Made init script more universal.
fixes for IDA+CVode
Updates to Form and FormElement. Converted placeholder to decorator.
small edits in 'more'
Added: a properitychange event parser
added: stack setting method
added hdi data to readme
Make Server.build() return the Server object. Close server after test.
Add test
Dependency twiddling
Fix off-by-one error in number of DBs. Add test.
Shut down thread pool when server is closed
Support GETBIT, SETBIT. Add overflow checking to INCRBY.
at test
Merge branch 'master' of github.com:ceyes/notes

Conflicts:
	test1

	modified:   test1
Merge branch 'master' of github.com:ceyes/notes

Conflicts:
	test1

	deleted:    test1
Merge branch 'master' of github.com:ceyes/notes

Conflicts:
	test1
Fixed ExB drift for electrons.
ELF support for LLD writer. The writer at present emits ELF header and section 
table header. Skeleton code for ReferenceKinds.
Credits:
Doxygen by  Michael Spencer.
Origianl implementation from Macho by Sidney Manning.
Templatization, implementation of section header chunks, string table, ELF header by Hemant Kulkarni.



git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@163906 91177308-0d34-0410-b5e6-96231b3b80d8
Set scala version for travis-ci.

Signed-off-by: Gary Pamparà <gpampara@gmail.com>
Adding walk dependency
configure: Don't overwrite other defs with TRACE

Signed-off-by: Lauri Kasanen <cand@gmx.com>
Signed-off-by: Eduardo Silva <edsiper@gmail.com>
config: Add some checks in SAFE_FREE for things that aren't alloced with the lib

Signed-off-by: Lauri Kasanen <cand@gmx.com>
Signed-off-by: Eduardo Silva <edsiper@gmail.com>
configure: Use wildcards for the man page installs

Signed-off-by: Lauri Kasanen <cand@gmx.com>
Signed-off-by: Eduardo Silva <edsiper@gmail.com>
- C++ Compatibility
- Misc cleanups
YamlImporter: use n_input for calculating testcases' value.
YamlImporter: fall back to Sum ScoreType if there is no gen/GEN (fixes #51).
Missing piece to a previous commit.
YamlImporter: when using Sum, make the total task value configurable.
libcmfs: add bitops.c and bitops.h, which are copied and modified from
bitops.c and bitops.h from ocfs2-tools.
libcmfs: copy ocfs2-tools/libocfs2/closefs.c into libcmfs/closefs.c
libcmfs: fix a typo in libcmfs/closefs.c
libcmfs: copy ocfs2-tools/libocfs2/openfs.c to
cmfs-tools/libcmfs/openfs.c

There are some logics simplified.
libcmfs: copy ocfs2-tools/libocfs2/ismounted.c into
cmfs-tools/libcmfs/ismounted.c

There are some logics simplified.
cmfs-tools: add misc/Makefile.am for member_offset.c
mkfs.cmfs: add more missing routines and data structures.

Currently the code still fails to compile. This commit includes,
- some comments in mkfs.h
- add bitmap member in allocgroup structure.
- add several routines in mkfs.c, e.g.
	* version()
 	* usage()
 	* do_pwrite()
	* get_valid_size()
	* fill_fake_fs()
	* get_number()
	* alloc_from_group()
	* alloc_inode()
	* alloc_directory()
	* initialize_alloc_group()
	* initialize_bitmap()
	* print_state()
	* clear_both_ends()
	* init_record()
mkfs.cmfs: include missing headers in check.c
mkfs.cmfs: changes to Makefile.am

The changes include,
- add check.c in mkfs_cmfs_SOURCE
- link libcmfs/libcmfs.a as mkfs_cmfs_LDADD
- link libcom_err and libuuid as mkfs_cmfs_LDFLAGS
- add VERSION macro for version() display, add this macro in
  mkfs_cmfs_CFLAGS.
libcmfs: fix a typo in libcmfs/getsectsize.c

When I copy and modify the code from ocfs2-tools, forget to change the
routine name to cmfs_get_device_sectsize().
This patch fixes the typo.
libcmfs: add more routines in libcmfs/dirblock.c

This patch adds routines including,
- cmfs_dir_trailer_blk_off()
- cmfs_support_dir_trailer()
- cmfs_swap_dir_trailer()
libcmfs: add more files in Makefile.am

This patch add kernel-rbtree.c, bitops.c, ismounted.c, openfs.c and
closefs.c in libcmfs_a_SOURCES
cmfs-tools: add more structures and inline routines into
include/cmfs-kenrel/cmfs_fs.h

This patch adds stuffs including,
- struct cmfs_group_desc
- macro CMFS_MIN_CLUSTERSIZE_BITS and CMFS_MAX_CLUSTERSIZE_BITS
- macro CMFS_GROUP_DESC_SIGNATURE
- macro CMFS_RAW_SB()
- macro CMFS_MAX_BG_BITMAP_SIZE
- inline routines,
	* cmfs_group_bitmap_size()
	* cmfs_chain_recs_per_inode()
cmfs-tools: add more stuffs into include/cmfs/cmfs.h

This patch adds,
- macro CMFS_MF{MOUNTED,ISROOT,READONLY,SWAP,BUSY}
- routine declarations,
	* cmfs_swap_dir_trailer()
	* cmfs_supports_dir_trailer()
	* cmfs_open()
	* cmfs_close()
	* cmfs_flush()
cmfs-tools: add more (build-generated) files/dirs to clean in clean-all.sh
Added the classes "toggle_desktop" and "toggle_mobile" to the desktop/mobile switch link (see #4975)
+ ‘3_2.jpg’
+ ‘Lectures/.~lock.29-Memory-Models-and-Dynamic-Arrays.pptx#’
Added complete stringtable header and an empty implementation file for it.
Stop using assert.typeOf as it seems to have vanished in new versions of buster
AST example for VimPEG
semantic check
semantic check
completed implementation.

TODO:
	make a custom scene .obj
Added ANT script, create DB sql, as well as APIs.
Clean destroy
Added job timeout while scheduling job
fs support in hails
Merge pull request #69 from deian/fs-support

fs support in hails
Add X-Hails-Sensitive header if result label is above lpub
Merge pull request #70 from alevy/master

Add X-Hails-Sensitive header if result label is above lpub
Fixed -STrace issues. Should now work. Not fully tested.
object cleanup and add debug for collisions
initial run at a serializer impl
fixed conflict caused by mask