labofsahil/github-event-dataset-2012 huggingface dataset:
+ Add image for new frogs [new in PF V2.0]
+ Add images for new frog [for PF V2.0]
+ Add patterns config for new frog [for PF V2.0] 
-x PNG normalizer
x Update gitignore
Merge branch 'gh-pages'

Conflicts:
	resources/frogs/frog_53_256.png
	resources/frogs/frog_54_256.png
	resources/frogs/frog_55_256.png
	resources/frogs/frog_56_256.png
	resources/frogs/frog_57_256.png
	resources/frogs/frog_58_256.png
	resources/frogs/frog_59_256.png
	resources/frogs/frog_60_256.png
	resources/frogs/frog_61_256.png
	resources/frogs/frog_62_256.png
	resources/frogs/frog_63_256.png
	resources/frogs/frog_64_256.png
	resources/frogs/frog_65_256.png
	resources/frogs/frog_66_256.png
	resources/frogs/frog_67_256.png
	resources/frogs/frog_68_256.png
	resources/frogs/frog_69_256.png
	resources/frogs/frog_70_256.png
	resources/frogs/frog_71_256.png
	resources/frogs/frog_72_256.png
	resources/frogs/frog_73_256.png
	resources/frogs/frog_74_256.png
	resources/frogs/frog_75_256.png
	resources/frogs/frog_76_256.png
	resources/frogs/frog_77_256.png
	resources/frogs/frog_78_256.png
	resources/frogs/frog_79_256.png
	resources/frogs/frog_80_256.png
	resources/frogs/frog_81_256.png
	resources/frogs/frog_82_256.png
	resources/frogs/frog_83_256.png
	resources/frogs/frog_84_256.png
	resources/frogs/frog_85_256.png
	resources/frogs/frog_86_256.png
	resources/frogs/frog_87_256.png
	resources/frogs/frog_88_256.png
	resources/frogs/frog_89_256.png
	resources/frogs/frog_90_256.png
	resources/frogs/frog_91_256.png
	resources/frogs/frog_92_256.png
	resources/frogs/frog_93_256.png
	resources/frogs/frog_94_256.png
	resources/frogs/frog_95_256.png
	resources/frogs/frog_96_256.png
	resources/frogs/frog_97_256.png
	resources/frogs/frog_98_256.png
	resources/frogs/frog_99_256.png
Replace urllib.quote with a string replace for just '/' as escaping symbols
like '+' leads to errors
add Angular and Chebyshev
GECKO_PATH and GECKO_OBJ_DIR should read the correct value
Merge pull request #288 from YiyiLee/Makefile_Error_Variable

GECKO_PATH and GECKO_OBJ_DIR should read the correct value
JsonBuffers implemented
fix mag filtration set
added prettyprint.js
added links in docs
Merge branch 'master' of github.com:andyet/talkbox
Fixed the homepage date display
Added specs for replay zip download
fixed no coin glitch
fixed no coin glitch
terserah gua commit message
update search DEFs traverse
take actual node
Fix model\request and router for foundation namespace
增加了新词发现功能
Added a PhantomJS script that searches for languages at stackoverflow.com
fix missing cache name in status page

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425287 13f79535-47bb-0310-9956-ffa450edef68
align name with others

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425289 13f79535-47bb-0310-9956-ffa450edef68
Refactored writing jar file.
Merged.
redirecting users in irc announcement to go to the new thread which links to wiki.
moving models to postgres for easier heroku deploy
Update magnetic-resonance-in-medicine.csl
More fix to TISTUD-7311.
TISTUD-1579 - Add a modules event ID to the browser-notifications.
Add a ProjectUtil function to check for project accessibility with a check for null.
APSTUD-4525 - Prevent zeros from the tab-width (tab-space) and indent-size.
Update the version to 1.1.0-dev
Fix a bug in test spec for IE6
Rebuild documentations
nico rebuild
update
update handlebars for test
add node_modules in .gitignore
move build dir to tools dir
rename docs directory
fix make file
CSPACE-5130: Removing methods that created computed display names.
CSPACE-5130: Commenting out implementations of handleComputedDisplayNames() method.
CSPACE-5130: Finished most of the special case handling for the Vocabulary item schema.
CSPACE-3718,CSPACE-5119: PersonValidatorHandler now extends ValidatorHandlerImpl. (Also performed automated reformatting of source code in the latter class for readability.)
Merge remote-tracking branch 'upstream/cspace-4813' into cspace-4813
CSPACE-5472: Re-enabled most XmlReplay-based tests in the services. Batch services-related tests need examination, as several test cases are currently failing, and as a result, the Batch control file has been left commented out in xml-replay-master.xml.
Merge remote-tracking branch 'upstream/master' into CSPACE-5271
CSPACE-5271,CSPACE-5274: Imports service now uses URI template registry to populate collectionspace_core:uri values in import template.
coffee, jade, less
R1 calling engine
for d sake of commiting
Merge remote-tracking branch 'origin/master'
Added method to determine if image is data cube
LAD
Remove redundant integration test
Add protocol to new channel
Fix more tests for 4seven channel
Fix more tests for 4seven
Removed wrong configuration class.
Fixed spring beans to avoid conflicts on autowiring.
Reverted back to 6d7a361.
Merged messaging branch.
Change CCFLAGS again.

It seems not all the options in CFLAGS that are available in gcc cannot be
used in g++.  This time only -Wall is specified with new OPTFLAGS, hoping
developer can pass their arguments on demand.
Remove dependency of v8/d8 to parse META.json.

Ideally we want to have only one place for the version string, but parsing
META.json is a bit challenging; at one time we had v8/d8 parsing META.json
to pass this value to source file, but it turned out those utilities may not
be available everywhere.  Since this integrity matters only developers,
we just check it if they are available.  We may come up with a better
solution to have it in one place in the future.
Support static link to v8.

In some circumstances, it is convenient to link v8 statically while we still
build plv8 with dynamic linking by default.  v8 supports both of dynamic and
static links, and also two modes of snapshot on and snapshot off in the static
library.  It might be possible to find the mode by looking at the v8 directory,
but it is wise to let users explicitly choose it to avoid to shoot in the foot.

Also rethink V8DIR, which was not working well.  Previous coding was not so
nice as the default value was quite unportable.  Now we have two different
variables, V8_SRCDIR pointing to the v8 source directory, and V8_OUTDIR
pointing to the v8 build output directory.  By default without specifying
them, the system will find the appropriate ones.  We might want to introduce
our own configure script, but for now we stay in Makefile which is still
simpler than other solutions.
Clean up Makefile.
Use the same version number across project and bump to 1.3.0devel.

Previously we chose different numbers as distribution version and extension
number, but it was sometimes confusing.  Hope one version is better than two.
Clean up dialect supports.

Dialects are now built by default.  A new option DISABLE_DIALECT=1 suppress
to build dialects into the shared object.
Add plcoffee and plls in META.json.

Now we build them by default, it is reasonable to expose them in PGXN.
Also bump the recommended PostgreSQL version.
Update README to reflect recent build system.
Add copyrights.
Tweak for 9.3devel.
Merge remote-tracking branch 'upstream/master'
Bringing changes from todomvc implementation back into this version
Saving/loading to/from hdf5

Signed-off-by: Andras Wacha <awacha@gmail.com>
Version 0.1.4

Signed-off-by: Andras Wacha <awacha@gmail.com>
really now... is it april 1st or is sublime just bored?
symfony 2.1.2
lifeEsperance lapin
Merge branch 'master' of github.com:bagage/travail

Conflicts:
	zz2/simulation/tp3/source/lapinRealiste.cpp
fix set test: don't rely on ordering of values in set
make some class methods public
fix require in package uninstaller
Moved to udp
modify pom.xml

reduce dependency duplication
fix build on mono with 4.0 profile
Added Index page

derp
Committer: frank001
added kick detection
Committer: frank001 <frank001@vms.zwerver.local>
Added delayed event invoking in shirk.py and extended core to handle a
basic Knockout procedure
	modified:   plugs/Auth/auth.py
	modified:   plugs/Core/core.py
	new file:   plugs/Guard/__init__.py
	new file:   plugs/Guard/guard.py
	modified:   plugs/plugbase.py
	modified:   shirk.py
	modified:   util.py
moved all the functionality of guarding the bot and channel to a
separate plugin. The changes in shirk are mandatory.
Added a delayed rejoin+counter when the bot is banned.
Code cleanup, knockout commands are now configurable, comments added.
Guard: configurable knout commands, code cleanup and comments.
introduced !knockout command to be used by ops.
added rejoin counter per banned channel. some minor bugfixes.
Guard now saves banned users and recovers them if necessary.
Making the recent update more pythonic, some cleanup.
Memoize the state of the streaming service into the request marker.
Added directoyry listing for Windows
Added three plugin functions to mod.py
* BotPlaylist plugin for playlist manipulation (queue current song)
* BotDJ can now /skip and /autoskip
[+] Added Microsys-PROMOTIC plugin
[+] Added activeCollab plugin
Bug fix: png transparency in Graphics::thumb
Merge pull request #174 from xfra35/issue#174

Bug fix: png transparency in Graphics::thumb
Removed top from .screenrc
Merge branch 'master' of github.com:beala/dotfiles
history.ru.wiki -> history.en.wiki
filesystem translation update
resolve conflict
Added http logging for both rovi requests and google's calendar api.
ex11: fork_tree implement
Updated teh Find and delete hidden worksheets
inirtial commit 2
Revised poster abstract.
added reactivity benchmark
impliment part of gbee_fill_word_flag
a little bit of refactoring
a little bit of refactoring + fix filtering
dumb fix for string comparison for contact exchange UIActionSheet
Implement basic file based cache for show_list view
applying style changes
End Chapter 9
Added new scaling_bloom_t_header attribute, max_id, to keeep track of max_id it has seen so the id on new counting_bloom_t's is always one more than max seen
Merge pull request #13 from hines/libdablooms_max_id_tracking_13

make adding new filters more robust against some element id disorder
ENH: ltisys: small PEP8 fixes

Fixes "E225 missing whitespace around operator".
only assert user-defined message ids on non-raw connections
Merge pull request #4 from mendsley/bug/rawassert

only assert user-defined message ids on non-raw connections
v 0.6.1 update
a bit of cleanup and permission tweaking
Wed Nov 21 07:12:12 CET 2012
Improved background compiler workflow
railz_ext
Code cleanup.

Remove references to no-longer-extant builtin collections, other cosmetic
improvements to viz code.
Merge branch 'master' into lattice-proto-v3
Made Ships a nested resource under Universe
Refactoring & Added json2 library for IE<8
Workouts and achievements team lists don't list your own items, just your teammates stuff.
Improve X icon hackery
Card module
Player closure
Player module
Game closure
Game module
SAKIII-5940 - Tried to create a collection in Safari but it wouldn't complete
https://jira.sakaiproject.org/browse/SAKIII-5940
SAKIII-5945 make publication url field a link
SAKIII-5926 - Widget page title defaults to "Content permissions"
Merge pull request #2282 from christianv/SAKIII-5940

SAKIII-5940 - Tried to create a collection in Safari but it wouldn't complete
Merge pull request #2284 from jsloane/SAKIII-5945

SAKIII-5945 make publication url field a link
Merge pull request #2285 from nicolaasmatthijs/SAKIII-5926

SAKIII-5926 - Widget page title defaults to "Content permissions"
ignore all files generated by dart2js
Use keys instead of not keys
capacity check added
error message for unspecified package
handle unresolved package errors
we are bundling deps, so really had better check them in
heed depreciation message
0.0.3
show usage instead of error message
0.0.4
fix npm root directory path
use the environment pager if specified
Merge branch 'master' of github.com:brainss/readme

Conflicts:
	index.js
test UniqueEmailAttribute
side menu added

;-)
re-factoring pypar: sequences
re-factoring pypar: infix
breaking out railtie
disable AAT Time notification for PG optimized Task
Improve layour multimap asp
Merge branch 'cm_aattime' of http://github.com/brunotl/LK8000
Fix function LKWriteBoxedText with WTALIGN_CENTER , not working previously.
Now it is available.
Advance with Multimap_Asp ideas.
Moving text in smaller panel label, available also for ASP 2/3 to move distance and other information directly in the boxed label text.
This label is dynamically moved in the part of screen with more space available.

Todo: a button or a menu activated to change terrain/topology/waypoint labels only in ASP pages.
Got some ideas, need a day..
PHP version 5.3 in docblocks + CS fixes
Enable building the test/ directory on win32.

But for now, only build the subset of tests that builds
successfully on win32 platforms.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
test/avl: Enable on win32 platforms.

By using srand()/rand() instead of srandom()/random().

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_thread: New function iv_thread_get_id().

Add a function iv_thread_get_id() to the iv_thread module, which
returns an unsigned long value that uniquely identifies the calling
thread.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_event_test: Remove pthreads dependency and enable on win32.

By using iv_thread_create() and iv_thread_get_id().

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_thread_test: Enable on win32.

By not running the cancellation test thread or the exit test
thread on win32.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_work_test: Remove pthreads dependency and enable on win32.

By using iv_thread_get_id(), and replacing a call to sleep(1) by
a call to Sleep(1000) when running on win32.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
test/struct_sizes: Enable on win32.

By looking at struct iv_handle/iv_handle_ instead of at struct
iv_fd/iv_fd_ when running on win32 platforms.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Add handle test application for win32 platforms.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_thread_posix: More implementations of get_thread_id().

This commit adds more implementations of iv_thread_posix's version
of get_thread_id().

On all POSIX platforms we currently run on, pthread_t is a scalar
type with sizeof(pthread_t) == sizeof(unsigned long), and so we could
just return the return value of pthread_self() cast to an unsigned
long as a unique thread identifier.

However, the goal of get_thread_id() is to return human-readable
values, and so, using the return value of pthread_self() isn't
always the best idea, since on a number of platforms, the pthread_t
type is used for storing a pointer, and pointers are generally not
very human-readable.

After this commit, we have the following platform-specific
implementations for get_thread_id():

- syscall(__NR_gettid) (sys/syscall.h) on Linux platforms.

- gettid() (process.h) on QNX.

- lwp_gettid() (unistd.h) on DragonFlyBSD.

- void thr_self(long *tid) (sys/ucontext.h + sys/thr.h) on
  FreeBSD.

- thread_t thr_self() (thread.h) (-lthread on AIX 7) on AIX 7,
  SCO OpenServer, Solaris, SCO UnixWare.

If none of these apply, we fall back to returning
(unsigned long)pthread_self() as described above.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_handle: Add missing iv_handle_registered().

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
NEW partition function
Not creating the response if it is invalid
Renamed SurveyQuestion model to Question.
Use ACTIVE/INACTIVE as the status for organization.

Got tests passing. Need to keyword search for
`pending/approved/rejected` and then make sure all strings in the UI are
up to date.
Rename all occurences of  related to Organizations found via a keyword search
+ ‘dossier sans titre 2/’
bump version to 1.8.11
clean up some scoping and clarify/update documentation.
support debug toggle on signal
Fixed Mac OS paths(on 10.8.1)
Disabled 'smart tab', that should be fixed the weird space with tabs replacement after working with git #vim
Fixing bug with PDO bug fix.

Signed-off-by: Ben Corlett <bencorlett@me.com>
removed debugging - https://github.com/mperham/sidekiq/pull/475#issuecomment-9886565
Changed Prop to use OnDelete for creating the decal rather than having it in the descriptor.
Made Delete() call OnDelete hook (BaseObject).
created/wired sign_up_success_view

users need special page on signup success to let them
know they need to verify the signup with confirmation
email sent to their email address
signup_complete.html template for sign_up_success_view
SMTP email settings now pulls from secure_settings.py file

secure_settings.py file is not in Git repo
it is stored in base project folder
secure_settings.py gitignore'd

it is stored in top level of project folder
(not in any app folders)
Modify build tree.
rename newRespMessage() to newResp()
added menu.bmp
Seems rbx is working!
Make libvirt URI configurable.
Argument --user-data= is repeatable, not NAME.

This looks like a rebase corruption from commit
9931544580d58e2e671c466e0760633321ebf3ed.
Don't specify exact QEmu machine type, let libvirt pick.

This makes downburst compatible with libvirt as it is on
Ubuntu 11.10.
init
update
appcache
bye
yo
appcache
jquery
mpl
fix
Handle modules with no constructor when passed in as a class and add a test case to ensure that modules included by modules can be instantiated if they're not passed in as instances.
Merge pull request #75 from cgruber/fixnoconstructormodules

Handle modules with no constructor when passed in as a class
Chart model update
Add a converter for User objects
Hyeon-Bin Jeong:  readsome() need to reset gcount to zero.  This fixes http://llvm.org/bugs/show_bug.cgi?id=14670.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@170703 91177308-0d34-0410-b5e6-96231b3b80d8
ArrrrCamp 2012: my Ruby heroes
fix build on 32-bit.
Update README.md

Added requirements on Windows (run as administrator / SeCreateSymbolicLinkPrivilege).
Backport .travis.yml
First stab at implementation of rev-parse.

This version supports refspecs of these kinds:
- Full & partial SHAs
- Output from "git describe"
- "/refs/heads/master" (full ref names)
- "master" (partial ref names)
- "FETCH_HEAD" (named heads)
Simpler states and initial structure.

New tests for "foo^2" syntax, but they don't pass
yet. Support for chaining these, i.e.
"foo^2~3^{u}~1' is starting to shape up.
Implemented partial caret syntax for rev-parse.

Supported forms:
- "^n"
- "^0"
- "^"

Still missing: all of the "^{…}" variants.
Implemented rev-parse's "^{}" syntax.
Implemented rev-parse "^{type}" syntax.
Returning error if dereferencing operation fails.
Removed goto from state machine loop.
Implementing rev-parse's "ref~2" syntax.

Also extended the test suite to include chaining
operators, e.g. "master^2~3^4".
Adding comment documentation for rev-parse api.
Implementing rev-parse's ref@{n} and @{-n} syntaxes.

Added some reflags to the test repo to support
unit tests.
Rev-parse chaining: adding the longest chain
in the test repo.
Incorporating feedback from @tanoku.

Removed repeated strlen's, and unnecessary loop-termination variable.
Rev-parse: plugging (most) memory leaks.
Fixed last 2 memory leaks in rev-parse.
Rev-parse: "ref@{upstream}" syntax.

Added tracking configuration to the test repo's
config to support unit tests.
Rev-parse: fixing double-freeing. Thanks, Visual Studio!
Rev-parse: "ref^{/regex}" syntax.
Rev-parse: @{time} syntax.

Ported date.c (for approxidate_careful) from git.git
revision aa39b85. Trimmed out the parts we're not
using.
Fixing broken tests.
het_reverse
fix GCTA .eigenvec loading bug with negative numbers
bugfix in setRenderArgs
[WiFi] Use oninput instead of onchange for PIN input event
Bug 799479: Fix Makefile paths on mingw/windows.
[bug 796731] Disable the Landscape mode
Bug 799135 - Sync indicator ui
First step towards Bug 800445 hiding address bar animation performance
Bug 802017 - Enable resume in wget downloads. r=vingtetun

This is helpful for those with flaky network connections.
[BB-buttons] simplify .icon-[view|dialog] markup
Bug 801447 - [clock] Clock app should listen for 'tap' not 'click'
Bug 802448 - ignore profile.tar.gz
don't let STK-UI break Gaia in desktop Firefox
Bug 795090 - Stop video recording before it fills /sdcard. r=vingetun
Added switches and edit_mode stable BB
Added stable buttons.css from shared, missed icons in social buttons (latest design) some css lint fixes and facebook disabled form elements
bug 802361 - stop deleting xulrunner in clean target
Tweak address bar animation further and fix regressions
Merging with upstream/master
Bug 802942 - Init the time picker with current time for empty input[type=time]
Bug 800258, 800696, 800803 - Major fixes & refactoring related to
notifications. a=blocking+ r=michable

- Cache events during initial sync so calendar is usable during that
  period.

- sends etags to caldav worker and only expands/sends results back when
  something has changes (major perf boost)

- Removes automatic creation of busytimes (technical debt)

- Adds mozAlarm webapi shim for b2g-desktop

- Alarms are no longer removed from the database only their trigger
  field. So we can modify them later.

- Fix bug in interval tree/busytime store which would somtimes lead to
  invalid entires in the busytime tree causing query failures.
Bug 796766 - (Calendar) Ensure delete button does not move when keyboard is shown r=michable a=blocking+
Bug 799866 - Clear currentFrame when going inactive in DayChild. Ensure changeDate is called when going inactive/active a=blocking+ r=michable
Le deuxième commit
ok
Add bg.html with basics CSS-based navigation.
actualization of html.index
Merge branch 'master' of github.com:clap-io/slides
Merge branch 'master' of github.com:clap-io/slides
new html.index
translations: Use MSGFMT var
add: replace placement new with a plain cast

can be done safely as chunk_header is plain old data
another try at reame
rewrite composition primarily for efficiency, but keep the doubly variadic version (perhaps)
wp-include added
added uiLog
lazy-load the Stylesheet block, to avoid a UIFont.systemFontOfSize() error, and some debug code, and some more comments
Register to Composer
Unit.raise_error
test for Unit.raise_error
rename to propagates_errors
Merge pull request #14 from sorah/dont_ignore_errors

Unit.propagates_errors
Refactor LocalText so it can be used as a singleton
more readme stuff
random spacing thing
fiddling with test.py
TST: debugging print
finally fixed bad repo check from response to github api
Add a simple test for the flowvisor library
Automated update of translation templates (POT) using latest strings.

Change-Id: Ic256d97c18526d54b295d0ec27889bac396c83f7
added travis config
removed 0.7 build
Update README.md
Added jshint with a hint.cmd file to fire it off.
Tidied up hinting errors.
Compile bootstrap css from the LESS files to allow us to easily change them as required.
Created Graphics branch
Jumping works with tiles
Graphics are working
Merge branch 'Graphics' of https://github.com/csce3513/Team2 into Graphics

Conflicts:
	Platformer.java
	Platformer/src/platformer/Platformer.java
	Platformer/src/platformer/Project.java
	Platformer/test/platformer/ProjectTest.java
	Project.java
	ProjectTest.java
	Second Release Code/Platformer.java
	Second Release Code/Project.java
	Second Release Code/ProjectTest.java
Updating to most stable version
Updated Player and Enemy graphics
Updated Readme
Something
Merging Graphics into master
Cleaning up Third Release Code
Finishiing Graphics merge to master
SFX volume working
do vardecl with expression on right side works
console.log debug statements for the server
nginx-conf file
Merge branch 'master' of git://github.com/ctrldavid/zkio
Merge branch 'master' of git://github.com/ctrldavid/zkio
Merge branch 'master' of git://github.com/ctrldavid/zkio
Merge branch 'master' of git://github.com/ctrldavid/zkio
Derping around
(tnoodle)Almost everything passes linting now! There are still a couple of php heredocs, but they're going away soon.
(tnoodle)Added new "./tmt pull-request" command that runs tests, and if they pass, issues a pull request.
(tnoodle)Fixed return code assertion for creating pull request.
(tnoodle)Function to create a pull request now prints out the url of the pull request if successful.
(tnoodle)sh wasn't working for me, so I figured it's sensible to change it to bash since that should work more universally
(tnoodle)Merge branch 'master' of https://github.com/cubing/tnoodle
Merge branch 'master' of github.com:jfly/git-tools into git-tools
ver 0.4

New access paths:

Public / Live results
- domain
- live.domain

Administration
- admin.domain
- domain/admin.php
(tnoodle)Got pdo stuff working with tnoodle.
Got pdo stuff working with tnoodle.
Merge https://github.com/Luis-J-Ianez/cubecomps.com into cubecomps.com

Conflicts:
	index.php
	lib_ref.php
	lib_ref_admin.php
Merge commit '54c80d06e233535b7e67782e14447d4b77b7db4a'
Merge commit '39bb96e5db20a9694e4822cb529152d35d1409d5'
Merge commit '66b97cbfcbd40412e8c3f9e3cb35c9965fb210b2'
Removed line from botched conflict resolution.
Now we'll at least know what the scramble was should we hit this
assertion again.
Puzzle subclasses can now override wcaMinScrambleDistance to customize
the minimum distance from solved that their randomly generated scrambles
will be. Optimized solvableIn() method to make this feasible by pruning
already visited nodes.
Made sturcture changes to happpi and fixed publish issues
update
new
Merge branch 'master' of https://github.com/czheo/dotfiles
minor change. Moved the vxl_obj_importer.py to the folder tools/importers
Added: More code comments.
First working version. Some problems with redrawing windows
add items added
add list spec
finish list
Changed: ajaxGetParticipatingSessionContentPage and
ajaxGetParticipatingSessionsContentGrids, Now those functions use
__generateParticipatingSessionsGridsData__ to create the data needed for
the grids.

Changed: variable names in ajaxGetParticipatingSessionContentPage and
ajaxGetParticipatingSessionsContentGrids

Changed: participantSessingSessionsContentGrids.html, all the variable
names for the previousResponse grid have been changed.

Added: __generateParticipatingSessionsGridsData__ This function is used
to generate the data needed for the tables in the
participantSessingSessionsContentGrids.html page.
Merge branch 'release/v3.1.19' into develop
Merge branch 'gh-pages' of github.com:darobin/respec into develop
v3.1.20
Merge branch 'release/v3.1.20' into gh-pages
Initial cut at an element model
Review URL: https://chromiumcodereview.appspot.com//10332118

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7657 260f80e4-7a28-3924-810f-c04153c831b5
result of 

 svn merge -r 7144:7232 https://dart.googlecode.com/svn/branches/bleeding_edge trunk



git-svn-id: https://dart.googlecode.com/svn/trunk@7237 260f80e4-7a28-3924-810f-c04153c831b5
Attempt to fix dart2js redness

TBR=lrn
Review URL: https://chromiumcodereview.appspot.com//10332250

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7747 260f80e4-7a28-3924-810f-c04153c831b5
Fix last windows timing dependent test.
Review URL: https://chromiumcodereview.appspot.com//10391198

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7748 260f80e4-7a28-3924-810f-c04153c831b5
Reapply this reverted change:
Implement updated method overriding rules (issue 2943).
Review URL: https://chromiumcodereview.appspot.com//10387186

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7749 260f80e4-7a28-3924-810f-c04153c831b5
Update locale char when moving position in number parsing in the JSON parser.

BUG=http://code.google.com/p/dart/issues/detail?id=2858
TEST=

Review URL: https://chromiumcodereview.appspot.com//10307003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7219 260f80e4-7a28-3924-810f-c04153c831b5
20120331g
debug and some documentation improvements.
Working in http resource : refactor io
Import shalma.maven
moved shalma.meta to shalma.macro
devise, mysql, landing page
Revert "test"

This reverts commit b834706ea527cad9af30371848b2b0f65590446c.
EA-36390 Guard rewriting constructor in slice
Change check for function slice rewrite with explicit guard
More information about errors in wrapping functions
EA-39162 Exception while trying to wrap method with default parameters
Move anonymous class to separate file
don't call toString for simple number literal and string
develar dictionary
my run configurations
my dart-ast
cosmetics
Throwable constructor parameter message should be nullable string
Throwable constructor parameter message should be nullable string
my dart-ast
translate when as if-else
generated js: readable notNullCheck
transform local vars captured in closure as object ref
my dart-ast
html stubs (should be discussed)
better js:

 var tmp$4;
list.add((tmp$4 = errorCallback) !== null && tmp$4 !== undefined ? tmp$4 : Kotlin.throwNPE());

can be just

list.add(errorCallback === null || errorCallback === undefined ? errorCallback : Kotlin.throwNPE());
better js:

 var tmp$4;
list.add((tmp$4 = errorCallback) !== null && tmp$4 !== undefined ? tmp$4 : Kotlin.throwNPE());

can be just

list.add(errorCallback === null || errorCallback === undefined ? errorCallback : Kotlin.throwNPE());
add new case for co api
Adding hgrc
dated release in changelog
Rename x1, x2 --> h1, h2
Got rid of some whitespace
Slight changes to broken power-law plot
Supplier interface and BuiltLazy class.
moved method from dcc-core
remove unused django_granular_permissions, django_rest_interface, django_tables, and corehq.util.{djangoplus,transformers} libraries
Update corehq/apps/builds/README.md
Merge branch 'master' into fix-submissions
clean a couple things up in orgp
the report config did not take into account reports that do not have access to the domain. disabled for those reports
Merge pull request #167 from dimagi/fix-billing

the report config did not take into account reports that do not have acc...
merge master (rename report favorites to saved reports and fix divs from biyeun's hotfix)
merge master (#reportFavorites -> #savedReports, fix divs from biyeun's hotfix)
Fix recipe for pov-mode
[archiso] Remove testiso script

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
[configs/releng] Remove [core] ISO generation

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Ignore entries in recycle bin (issue #8)
add empty options dialog
separate entry and group in key list
fix bugs with ignoring recycle bin
fix bug with plgx not working with 2.17
Adding steps 3-4.
check cell now returns all forms -- but no values
halt music after intro
auto pass sb flags to git status alias
Docs updates:
- added Layout and Widget references
- Contents page reoganization
destroy session client
Update oh-my-zsh module
Vifm tweaks
fixed error in Results
Added an empty room and temporary character location.
Fix a minor bug with importing from UCCU
Bump the version
Made autoloader targets specifying standard whitespace insensitive
Merge branch 'master' into response_php
Fix a typo 'iff' => 'if'

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164766 91177308-0d34-0410-b5e6-96231b3b80d8
Revert 'Fix a typo 'iff' => 'if''. iff is an abreviation of if and only if. See: http://en.wikipedia.org/wiki/If_and_only_if Commit 164766

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164769 91177308-0d34-0410-b5e6-96231b3b80d8
Shrink LinkageInfo from 96 bits to 8 bits.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164771 91177308-0d34-0410-b5e6-96231b3b80d8
Following up on r164620, cope with symlinking from an embedded
framework location out to a top-level framework. Such frameworks are
not really embedded at all.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164774 91177308-0d34-0410-b5e6-96231b3b80d8
clang/test/CodeGen/ms-inline-asm.c: It requires x86 codegen. Reported by Joey Gouly.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164775 91177308-0d34-0410-b5e6-96231b3b80d8
Pass PrintingPolicy by reference, copying it isn't cheap.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164781 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Address Jordan's code review comments for r164716.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164788 91177308-0d34-0410-b5e6-96231b3b80d8
Make getDefaultSynthIvarName() a member of ObjCPropertyDecl.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164789 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Add an experimental ObjC direct ivar assignment checker.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164790 91177308-0d34-0410-b5e6-96231b3b80d8
Unbreak cmake build
(fixup for r164790)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164791 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] IvarInvalidation: track synthesized ivars and allow escape
through property getters.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164802 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Address Jordan's code review for r164790.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164803 91177308-0d34-0410-b5e6-96231b3b80d8
Fix a regression from r164656.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164804 91177308-0d34-0410-b5e6-96231b3b80d8
Move main into class
Add ExcelRow and minor refactor
Add event to filter widget classes.
Removed old prototype classes
Made it (impossible? hard?) to switch out of the camera view in anything other than camera mode. Review and coutdown modes both remove the close button, don't allow emoji tab clicks, or background clicks anymore.
naming save file and using it as the location
Arrumando objeto nulo
giving the login header an absolute path
making companies register page post to an absolute link
stripped down the view
Merge branch 'master' of github.com:dw2/Bangladash
Updated content form to fit in sidenav. Updated reply form to make it more user friendly.
Added a border to sidenav and removed reply and delete links from it.
store api in process [4]
Add requirements and gitignore.
Minor typo fix.
Migrate to sbt 0.11.2
Small cleanups, sync with Twitter internal
Merge remote-tracking branch 'upstream/master'
Adding some documentation.
Merge pull request #5 from mallman/master

Partial conversion to sbt 0.11.2
Fixes sbt 0.11 tests / assembly
Updates the readme to be correct for sbt 0.11
Fixes janino issue with bad jar signature
Update scoobi comparison in README
Merge pull request #6 from espringe/master

Update README
Rename KryoTests to KryoTest
Sync with Twitter internal, bump version
Add scala syntax highlighting to CodeSnippets.md
Apparently this only works with newlines.
Merge pull request #9 from johnynek/dev

Bump to 0.3.0
Merge pull request #10 from azymnis/master

Change syntax highlighting in code snippets
Add HadoopMode for local Hadoop job testing.
Bump version to 0.3.1
Merge pull request #11 from azymnis/master

Add HadoopTest mode for local testing.
stuff
solarized .Xresources
Updating with new diagram class

now every item writes to svg, png , pdf
updated PreviewProperties to include some legend properties
Updating with new diagram class

now every item writes to sag, png , pdf
updated PreviewProperties to include some legend properties
New functions, combination functions and generator configuration improvements.
New data including modified
Keycode changed (using xev).
emit an error if jquery fails
setup basic styles for demonstration application
fix bug - html / JS call distinction
improving example app, fixing bugs
arreglo de un import.
bringing over review fixes from symposion
inverted DEBUG handling to be less error prone
use Error for handling errors so stack trace can be read
Merge branch 'master' of github.com:eleith/emailjs
Styling for additional professional category
Added &_dump.
district reports district analysis is now working
Code review
Add test for session allocation failures
WebSocket cleanup
Update deps
Refactor httpPump engine
'removed_passets'
adding cross correlation via spectrum
Merge branch 'master' of /Users/tofu/Documents/Test/pyrocko into version-0.3-alpha
fix ordering of result of fft cross correlation
few minor improvements to cake
fixed order of result in cross correlation with fft
fix for last commit
allow for all modes and lengthes in correlate via fft
Merge branch 'master' into version-0.3-alpha

Conflicts:
	pyrocko/trace.py
Add sample showing how to calculate distances using SQL Server CLR types
Improved speed by replacing sudoku copy with undo move
Add getvalue function and timer
Introduced caching for computed fields
Refactor such that codecs carry the cursor history.
json name
new codec
Just wrote the codes, haven't been tested.
Doc: reflect new view of expressions, as returning value + channel set.
OLOLO
Merge branch 'master' of github.com:erlioniel/Test

Conflicts:
	dir/ToDel.txt
Fix capitalization to be closer to featurelist.pm
Make capitalization and feature descriptions more consistent and thus easier to autogenerate
More capitalization fixes
flattened runconfig dir structure
minor
adding a.rkt
[Fruits] Reorganized files a little
[test] added test files
Dumping metadata (primitive working)
Made tests work

The file system had some trouble dealing with file types.
Makefile: only what is useful (see #93).
Live previews: a few fixes to #94.

- event listener fix for some browsers
- document.open does not flood the history stack
- maybe a couple more brushstrokes.
Dumping metadata to disk
Merge branch 'master' of https://github.com/jankeromnes/tree
Extracted the web service project into a separate solution
Evolution bug workaround. Fixes Issue 213.
wrong version of ComicRN.py - fixed
added test/search.py for debugging. will output more details to console to determine where failing on searches and downloads
Fixed file permissions for truncating logs
ADDED top level options page Booty Notice + registration of 3 options
Testando Prog
Fix bridge UI sizes
Catia/Claudia: Fix globalmenu transport not disabled; fix a2j usage on jack1 non-dbus
Carla: dispatch VST effBegin/EndSetProgram between effSetProgram calls
Carla: More fixing on VST and bridges
重构配置文件（包括shiro)，并编写用户的Controller,Service,Repository测试样例
Perlito5 - javascript: placeholder code for ~~ operator
added postformat step
Reformat.
Reformat.
Reformat.
Reformat.
Reformat.
Reformat.
Reformat.
Reformat.
Reformat.
Reformat.
Reindent.
Reindent for 8-space tabs.
Fixes #12518, removes an offsetWidth on focus/blur events for an <IE9 bug that caused a performance hit
Cleaned up cmake targets
manager-collections-portlet: ranging issues using HashMap
manager-collections-portlet: sorting ranged issues
for merging
survey filter params needed for allfilters (survey, location, and location type filters) now included
survey and location params persisting when updating the data location type filter
added a few more logs, fixed bug where params were still not persisting when updating the data location type filter, also fixed summary page bug where params were not correctly copied into new params variables when passed to each top level filter, created method for creating a link with ability to specify params to exclude, and updated tests
fixed/updated more tests
fixed minor bug with location filter
merged with master pull and fixed conflicts
commented prod env config
added "not yet implemented" notification to Receiver::disconnect
yay email works
Add Turnip tests and views. App has basic functionality.
Add config.ru
Finish sources nav
use a flag for selection status, instead of relying on the UI of the
control, in this way, the selection status is updated at the right
moment, when the control is clicked
[gc496] add some config options to Crypt Run
add back GeoExt.Lang core functionality
yui-cssreset + jquery
todo_fix
wtf?
teste
Merge branch 'master' of github.com:gilgomesp/blog
Fixing test errors after merged pull request #99
Merge pull request #102 from fabianoalmeida/master

Fixing test errors after merged pull request
Run install/uninstall operations in appdomain
Update 2 strings in Slovak translation

Closes pull request #188
0.9.5c
0.9.6
0.9.8b - fixing bug with object comprehensions
A simple commit to align with origin.
Merge branch 'master' of github.com:glipari/rtscan

Conflicts:
	test/TestCommon.cpp
Merge branch 'master' of github.com:glipari/rtscan
Merge branch 'master' of github.com:glipari/rtscan
Merge branch 'master' of github.com:glipari/rtscan
Completing the work on generic sensitivity analysis
Almost completed. Next step is the projection.
api/webserver: added route for RemoveUnitsHandler

Related to #250.
Removed old templates.
Added transpatency for mosaic.
Change jquery.mosaic effects for products list.
Set content type of .ccns uri to 'x-ccnx-video/webm', it only works for video
only.

TODO add audio support later.
To add audio, we may need an entire different channel, i.e. we need two
channels to handle to same uri. Maybe we should pick a separate protocol
prefix instead
Initial HTTP Cache experimentation
Only cache requests issued via GET and HEAD (as per RFC)
Loop to produce $results for mget was setting the values correct.  We want $results[<key>] = <value>, not $results[<key>] = $results[<value>]
updated CHANGELOG with CDbCache mget error
added my name to match other entries.
Added back in initial blank line
Formatted method name more clearly
Added unit test to exercise CDbCache::mget
match no newline at eof
consistent tab usage with existing code
#539 Fix CUrlRule::createUrl() to treat sub-patterns as Unicode.
Fix #220 - Use protocol relative URL in CGoogleApi
removed .svn from exclude list
Merge remote-tracking branch 'upstream/master' into fix-220
Added documentation for CGoogleApi::$bootstrapUrl
Merge pull request #540 from ranvis/539-createUrl-array-param

#539 Fix CUrlRule::createUrl() to treat sub-patterns as Unicode.
Issue #538 - additional fixes
Merge remote branch 'origin/master'
changed .svn to .gitignore in commands in build folder
added .gitignore to exclude list
Fix for MOSYNC-2115 "Deleting a NativeUI DatePicker crashes the app on iOS"
Fix for CJLO-52 "ListView - removeChild(section) does not work on iOS"
cleanup
Merge branch 'dvp-sslproto' of github.com:grwl/sslcaudit into dvp-sslproto
Implemented __str__ method for sslproto.ProfileFactory. Now it returns description containing a list of protos and ciphers.
Improved error handling. Now if the user requests an unsupported protocol version it gets detected early.
Ability to run go test
Docs
sqlite 3.7.15

Closes #16634.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
gauche 0.9.3.3

Closes #16633.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
cdrtools: use make instead of smake
Updated opensc to the latest version.
Merge branch 'master' into svn_pkcs11
add base views for recive editor data
Update sprints and users
Merge branch 'master' of https://github.com/hackvish/diddo.git
testOk print
Change file icon to orange
[client] Fix minor bugs in sync algorithm.

* Transition to error state when commit fails;
* In manual sync, start syncing even no files to be commited;
* Allows to add .git files.
Implemented gui to add new environment, all tests pass\
Fix #8 - Enabled javascript support by default
only do init when needed
fixed pull to refresh bug by adding delay to reloading data and not performing parse query in background
Sticky listings are no longer grouped.
Pierwsze laboratorium z PJP - niedopracowany kod; testy do zadania o liscie PESELi.
Started work on the highscores
Merge branch 'master' of github.com:hathcox/Arthur
Fixed indentation issue in mappings.py
trivial changes
merged
compiles!
Added untar_failure locale.
Added already_exists locale.
Fix 2 broken document links
Add config.arguments for Chef

* Adds chef.arguments to Chef::Provisioner::Config
* Usable in both chef-client and chef-solo
* Specify as a string, "-L /tmp/foo.log", e.g.
Convey default destroy confirmation choice as 'N'

The convention is to capitalize the default choice when presenting
the user with a confirmation dialog. This alters the choices for
'vagrant destroy' confirmation from [Y/N] to [y/N].
`box.url` can use `file://` URI
Use the communicate interface for ArchLinux guests
Add missing "saving" transition for VirtualBox machine [GH-1110]
Merge pull request #1096 from danmidwood/master

Use the communicate interface for Arch Linux guests
Error message on ECONNRESET for box downloading via HTTP [GH-1090]
Merge pull request #1087 from nwjsmith/master

Allow `file://` URIs from `config.box.url`
Clean up logic surrounding file downloader matching
Merge pull request #1071 from bcwaldon/confirm-opt-default

Convey default destroy confirmation choice as 'N'
Merge pull request #1056 from jmazzi/patch-1

Fix 2 broken document links
Emitting vagrant-mount events when mounting nfs volumes
VirtualBox 4.2 support
Forward Port GH-1140
Forward port GH-1142
create human readable dna.json
fixes an exception issue when a non-directory appears in the boxes dir
draw static lines in vertical, this solves #1
yup
Merge branch 'master' of github.com:helioliu/vooga
demogame commit
demogame commit
delroute
miss update
Update itools to 0.75.1
Made first steps to style the "open list" overlay.
Added Xe135 event generator
Cleanup and new class for multiply rotating input simulation data
Xenon endpoint study comparison against simulation
kapitel 9 finished
Parser is parsing the simple.jm example properly.
Add an emacs theme.
tools.py tests/test_tools.py decorator_generator and its tests
pull up modified as pull down
map posts
Fixed style name for the combo box (items).
Bug 815452: Hook up FM radio to the audio manager. r=sicking a=blocking-basecamp
New (and old) stat related items

* Enabled goggles of acuity again (+1 to all stats)
* Diadem of the priestess (+2 spirit)
* Shirt of muscles (+2 body)
Teleportation beacon fix

Make sure there is no turned on teleportation beacon in a hidden room.
Magical guides

Added a new type of item, the magical guide. Reading a magical guide
identifies a couple of scroll types. There are currently four magical
guides:

1. Introduction to Necromancy (death, summoning, ghoulification)
2. Battle Magic for Beginners (the blade, protection)
3. Handbook of Subtle Magics (skill, shadows, teleportation)
4. Miscellanea Magica (three random scroll types)

Because I'm using the scroll names, there are currently two problems:
"the-blade" and "shdoaws-name" don't look like they should to the
player. I still need to fix that.
Adding Validation in Edit option for Sendori App tool.
Aug.3rd commit files from evanmiller/erlydtl.git
Improved background loading of chunks.
build
some math utils
utils
utils
fix key mappings
applyTorque function
add custom menufun plugin
add testify submod
Use cloudflare CDN for underscore
- added admin to routes
SignActivity.javaで用いるボタンを追加
added example of solving classify_problem2
Moved Build Sequence to F# from Scheme
added timezone config.
bubbles: legend for OD-colors
IS07
change from os.system to subprocess.popen - better arg handling
changed os.system calls to subprocess.Popen calls to stop the console appearing
set the console to appear in new Popen commands if we are not in UI mode
update of os.system to subprocess.Popen bug fix
more fixes to subprocess.Popen issues
trying to avoid a pyinstaller bug which doesnt like the subprocess module
trying again to work around this bug in pyinstaller
more bug workaround attempts
adding some debug lines for subprocess fix attempt
using os.getcwd() instead of self.getPathFromFilePath(sys.argv[0]) to attempt to fix annoying subprocess bug workaround
tidying up debug lines
fixing console window coming up at all shell commands in UI mode
adding QueryValueEx import line because i forgot it in the last build
removing some whitespace from jinn.py and
Merge branch 'py-gui' into ISSUE-94

Conflicts:
	Jinn.py
debug to make it play

it still does not get the users right. The server sends back something,
but it does not populate the Users Collection.
test: add failing test (nested while)