labofsahil/github-event-dataset-2012 huggingface dataset:
Fix missing forge stub and directory check due to test change in 3.x branch rollup

This fixes a test error that was being thrown by the
modules/install/nonexistent_directory.rb file.

In recent commits we added a more clever way to stub the forge host in 2.7.x,
and obtain a forge hostname. This test however went from being a non-network
capable test to a networked one in 3.x, so the rollup from 2.7.x->3.x meant our
changes weren't applied to this particular case. This patch fixes that by
adding the correct stubbing method 'stub_forge_on' to the top of the file.

It also corrects a negated directory check which creaped in during merge up and
ensures proper cleanup using the new teardown mechanism (like the other tests).
Merge branch 'kbarber-ticket/3.x/pmt_missing_stub_on_test_nonexistent_dir' into 3.x

* kbarber-ticket/3.x/pmt_missing_stub_on_test_nonexistent_dir:
  Fix missing forge stub and directory check due to test change in 3.x branch rollup
Slightly faster InvFull function, just thought I would submit instead of making a whole thread
Fixed Refactoring
Shader 3D
First Rendering is ok
making the btapp object an object member of the welcome view
added position estimator documentation
added xyz plot of position and gps
Convert the IO driver to the new driver model.
Include path fixup.
Checkpoint; add an uploader for the IO firmware, more work on the general IO driver.
IO currently talks at 115200 by default.
Add an 'update' verb to the px4io command.  Build out the uploader to actually flash. Tested only so far as getting sync with the bootloader.
Flesh out the PX4IO firmware uploader.  This works reliably now.
[RpgBundle] Correction de LoversBunlde
Close internal image support
add misc settings
Link instead of spawn on invader.
Shorten Consts to C.
Delete Needs
Remove .bashrc and introduce helper files
Add linux ignore files
:
Merge branch 'master' of github.com:railgunlv5/twesty
Merge branch 'master' of github.com:railgunlv5/twesty
Merge branch 'master' of github.com:railgunlv5/twesty
Merge branch 'master' of github.com:railgunlv5/twesty
Merge branch 'master' of github.com:railgunlv5/twesty
Merge branch 'master' of github.com:railgunlv5/twesty
Merge branch 'master' of github.com:railgunlv5/twesty
yo
8 и 9
Короткая запись {=func()}
Add a validation to ensure names are specified when creating projects
First Commit
Merge branch 'master' of https://github.com/raphabot/catagram
[plan]每周新计划
set i2c speed via module-parameter or menuconfig. Thanks FrankBoesing
Updated player movement routines
attempt to fix errno() on linux
history scroll and format
adding back button and such
adding back button and such
Updated to revision 1662
Some more update
Add the quickproject script.
Add a cute lisp mocking utility found on stackoverflow.
Added Role and Rule models.
Fixed indent on item lists
Darkened gray text on LaTeX PDF to allow it to print better
Fixed audits not correctly showing subject path
specswitchfilter: Fix login error.
invite: Use new MoP functions.
- GetNumPartyMembers => GetNumSubgroupMembers.
- GetNumRaidMembers => GetNumGroupMembers.
Have wp_upload_dir() account for blog switching, ms-files rewriting, and the UPLOADS constant properly. This type of logic needs a lot of code comments.

Prevents wp_upload_dir() from obeying the UPLOADS constant when ms-files rewriting is enabled and a blog is switched.

Reverts [22106] thanks to [22108].

see #19235.



git-svn-id: http://core.svn.wordpress.org/trunk@22222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.5-beta1-22223. TinyMCE updated.

git-svn-id: http://core.svn.wordpress.org/trunk@22223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
3.5-beta2.



git-svn-id: http://core.svn.wordpress.org/trunk@22224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Merge branch 'master' of https://github.com/WordPress/WordPress
Merge branch 'master' of https://github.com/rfmeier/WordPress
ex17
ex16
namespace のスニペット
Added in Gevent
EXT_buffer_age: fix INTEL/EXT rename

The last rename commit just renamed the file but didn't update the text
of the extension itself. This patch updates the extension text too.
EGL_EXT_buffer_age: don't depend on start_frame ext

Instead of depending on a separate EGL_EXT_start_frame extension to
explicitly start a new frame before querying the back buffer age the
wording for EGL_EXT_buffer_age was changed so it's now guaranteed that
once the age has been queried then the age must remain valid until the
end of the frame, which implies that the driver must start a new frame
internally.

This patch removes the EGL_EXT_start_frame spec
Delete GLX_EXT_start_frame.txt

Since GLX_EXT_buffer_age was updated to no longer depend on a separate
GLX_EXT_start_frame extension this is redundant so we can delete it.
EGL_EXT_buffer_age: Discount partially owned buffers

This adds a clarification that drivers should discount buffers that are
not fully owned by the client (where every pixel wouldn't pass the pixel
ownership test) since application will find it difficult to re-use such
buffers.

This change is to consider that some drivers may support unified
back-buffer architectures where windows that have overlaps may not
own all of the pixels in their back buffer.
fix validation message css
glwtWindowGetSize

Add a function to query current window size.

Use glXQueryDrawable to implement it on X11/GLX.
Use XGetVisualInfo, not glXGetVisualFromFBConfig

Use XGetVisualInfo to query appropriate visual instead of
glXGetVisualFromFBConfig. This is needed in EGL, where only the visual
id can be queried from a config.
Add EGL support
Test for preservation of utf8 characters

which fails on perls 5.14+
UTF8 encode appended file content

Archive::Tar expects octets will corrupt the tar on perls 5.14+
when given a character string.
Both YAML and JSON (CPAN Meta) files should be in uf8 so this should be ok.
thanks, Randy!
avoid a 5.17.3 warning for now
v0.010

          encode append content to UTF-8 before appending it (thanks, Randy
          Stauner!)
skip intro
layout fix
tr + tl corners disabled (dirty bug fix on top right corner hover in chrome)
added /iframe/<zoom>
map vis not yet a class
enable visual connections
Storing mount name in sources array
Add license and docblocks
minor bug fix
OAuth 2.0
OAuth 2.0 + Google Tasks
OAuth 2.0 + Google Tasks; listing tasks from default list
metadata
new feature for oauth: auto sign in
update google tasks
remove refresh token if authorization fail
remove matrix
Preparing complex api for Google Task
Merge remote-tracking branch 'origin/master' into burza-gtask-api

Conflicts:
	MobileExamples/src/view/oauth2/OAuthTasksList.mxml
	RNLib/src/com/rnlib/apis/googleTasks/GTaskEvent.as
	RNLib/src/com/rnlib/apis/googleTasks/GTaskService.as
	RNLib/src/com/rnlib/apis/googleTasks/GTasksListService.as
	RNLib/src/com/rnlib/net/plugins/NetPluginEvent.as
Merge remote-tracking branch 'origin/master' into burza-gtask-api
event metadata
google tasks list api
implement google task api methods
additional google tasks methods
copyrights update
Merge branch 'master' into burza-gtask-api
Tasks lists methods update
Clear loader and catch http response status code
http response status code recognition
add updtodate SRCREV

Signed-off-by: Robert Woerle <robert@linuxdevelopment.de>
Better regular expression syntax checking

And a limitation elaboration
Finalize README.
Remove task file that is not being used.
Added new file
Removed and modified
Updated Home Page
Trying to import wordpress
update before I try something
Updated JS setup with an almost functioing basic host - lots of work still needed
Updated JS structure - not yet tested or working but structure is on the way to being as we want it to be.
system komentarzy + zmiany w showReg.php

....
remove MS Team Foundation Info from this proj, and and new content to CChessPiece.cpp
Optimized code by adding a vertwrapper fxn with common code block.
Merge pull request #4 from vijaybarve/master

Optimized code by adding a vertwrapper fxn with common code block.
get rhtml mode working and tweak

the frame buffer width/height
Replaces `match` with `get`. `match` is removed in Rails 4
add first example files.
Los triggers hacen algo supuestamente ahora
Allow somebody else to define build-essential and autoconf.

This is ugly
rework exception management for JRuby compatibility
Merge pull request #355 from alexch/fork_docs

rework exception management for JRuby compatibility
Show the minimum gems that will be broken post uninstall. Fixes #169
add acl9 gem
create required tables
Merge github_auth into add-acl9
specs
Specified a version for the gem
Removed brackets
Merge pull request #16 from rubytij/add-acl9

Add acl9
Merge branch 'master' into systemtimer-gemfix

Conflicts:
	Gemfile
Merge pull request #15 from rubytij/systemtimer-gemfix

Only install system_timer on Ruby 1.8, fixes #14
Merge branch 'master' into markdown-editor

Conflicts:
	Gemfile
Merge pull request #29 from ruijin/master

Auto scale the patch to fit the screen
Fixed issue #30 - text input now works properly (incorrect splitting of
lines)
fix some curature issue, add curvature for triangular patch.
Minor change to doc.

Adding the reason for such a long parameter name.
Allow nova rate limiting to be disabled

 * fixes bug 959518

Change-Id: Ifc469a2e1cd90737420c17af513d9c39fb57ffb5
Add support for Fedora 16

Highlights:
* Add GetOSInfo, package_install, yum_install to functions
* Add files/rpms/*
* get_packages() only loads deps for services that are enabled
* begin moving log files to /opt/stack/logs
  * Apache logs moved, working with SELinux thanks to rbryant@redhat.com

23Feb2012
    SELinux, horizon deps, cloudfiles version
27Feb2012
    More SELinux, tgt
06Mar2012
    Rebase, apache logs
13Mar2012
    Rebase, sudo, apache logs redux
16Mar2012
    Rebase, apache log tail
21Mar2012
    Rebase, memcached; sudo and nova-rootwrap from russellb

Change-Id: I059ae1c0676ed6da805a8dc6bae7565ab6f61c71
Add support for using Qpid instead of RabbitMQ.

To use Qpid instead of RabbitMQ, you set "MESSAGING_SYSTEM=qpid" in
localrc.  Otherwise, RabbitMQ is still used by default.
Fix undefined uint32_t and uint64_t problem

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Fix whitespace so that building with gmake works

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Disable strict aliasing

This is 900_all_grub-0.97-no-strict-aliasing.patch from Gentoo

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Fix infinite boot loop with >=gcc-4.6

This is patch/901_all_grub-0.97-fix-gcc46-reboot-issue.patch from Gentoo

https://bugs.gentoo.org/show_bug.cgi?id=360513
http://code.google.com/p/grub4dos-chenall/source/browse/trunk/stage2/bios.c?spec=svn290&r=290

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Disable SSE Code Generation

Attempting to use the CPU's SSE capabilities in GRUB requires
initializing SSE support. GRUB does not do that, so we disable SSE
assembly generation.

This is 908_all_grub-0.97-no-sse.patch from Gentoo.

http://wiki.osdev.org/SSE#Adding_support
https://bugs.gentoo.org/360513

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Fix miscompilation with GCC 4.6

This is 012_all_grub-0.97-gcc46.patch from Gentoo

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Automake files use reserved keyword

This is 825_all_grub-0.97-automake-pkglib.patch from Gentoo.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
GPT Partition Support

This is 600_all_grub-0.97-gpt-partition-table.patch from Gentoo.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Use AM_PROG_AS

This is 008_all_grub-0.97-AM_PROG_AS.patch from Gentoo.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Remove superfluous trailing backslash

The following error being output from automake caused a build failure in
Gentoo:

stage2/Makefile.am:30: blank line following trailing backslash

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
PIC Support

This is 005_all_grub-0.96-PIC.patch from Gentoo.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Make gpt.h use types.h

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Generate feeds that use 0cmake
Explicitly set the CMAKE_MODULE_PATH when dumping XML metadata
omnicomplcache設定を分離
インデント処理を分離
初期化処理修正
Actualización al artículo Plan de Gobierno
Merge pull request #278 from kramer314/gh-266

Fix error message formatting / display

Fixes gh-266, and also gets rid of a lot of our custom modifications for traceback printing code that we don't need anymore.
login werkend. set favorite and going gebeurt per username. rating werkt. uitgebreide zoekfunctie werkt. dit alles zonder gebruik van jQuery mobile. Net geprobeert aan te zetten, maar dit vereist veel extra programmeerwerk waar ik de tijd nu niet voor heb.
Moving various formulas into their own repository to utilize brew tap.
CURLOPT_SSL_VERIFYHOST support for value 1 removed in cURL 7.28.1

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328859 c90b9560-bf6c-de11-be94-00142212c4b1
Remove duplicate info about initializers

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@324585 c90b9560-bf6c-de11-be94-00142212c4b1
magic_quotes_gpc is not on by default anymore

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@324587 c90b9560-bf6c-de11-be94-00142212c4b1
Add iphone style for article width when .no-masonry
First working version
First finallized version
another cleanup
remove comments, re-arrange some things.
remove ssh alias and add quick compile function
dotfiles cleanup 16/08/2012
organise dotfiles ready for the use of dfmt
Make sure Counter implementation expvar.Var
run tmux by default
Add omniauth.
Add omniauth config.
Add identity.
Do db:migrate
Add parent class.
Routing
Revert "Add omniauth."

This reverts commit 65ae784c7cfb09bc17755a47408838bf8b8f9224.
AC-18: Upgrade to Jersey 1.15 and correctly scope servlet API as provided.
AC-16: A simple Freemarker template for listing larger values on all keys for a single application.
AC-16: Allow configuration of env/app combo to use to get devops template and dictionary configs.
AC-10: Add an experimental form based property editor.
Update debianization.
More work.
Standard build script for Debian package.
removed cat from item
New config vor antares_I
make changes based on advanced install video
Added support for functions with three arguments, including if statements.
Optimized synthesis to try to enable deeper search.
Merge pull request #24 from schasins/master

Synthesizer Optimization
Add unit tests for LIST and UIDL
move `trait BuildInfo` as `trait Entry` into `object BuildInfo`. Add top level type alias `BuildInfo`. Appending to key seq now uses `Seq[BuildInfo]`. Remove unnecessary `mapInfo` method. Update the README. Bump version to 0.2.1-SNAPSHOT (sorry - had problems with local cache I couldn't resolve)
Merge pull request #5 from Sciss/master

Avoid existential type BuildInfo[_]
closes #226 adds spec for format from query param
Also add a factory parameters version
use webtest instead of twill

webtest works with python 3.

we now also get rid of paste and pastedeploy and use
bottle.Bottle.mount instead.
make tests succeed under python 3
add python 3.2 and 3.3 to tox envlist
copies the _defaults.scss to check if this fixes the compilation error on heroku
Added SABnzbd._getScriptDir() to handle when the configuration 'script_dir' is a relative path. Fixes #134
Renamed SABnzbd._getScriptDir() to SABnzbd.get_script_dir().
Merge pull request #136 from redsolo/develop

Fixes if SABnzbd config script_dir is relative
Update subliminal spk

- Add DSM Notifications
- Update subliminal to 0.6.1
- Better error handling
- Fix single language selection
Added explanations about the multiple subtitles use
Added description about the multiple subtitles use
Update subliminal spk

- Fix single subtitles naming
- Fix DSM window height
Update subliminal spk

- Use flask
- Introduce the auth module to easily deal with DSM user authentication
in flask CGIs
- Move the python application to its own package directory but leave
executables at the top level
- Make the directory scan method asynchronous using scanner.py so that
ExtJS does not timeout
- Fix subtitles count in DSM notifications
- Fix possible cache corruption during simultaneous multiple manual scans
Fix umurmur spk spanish description
Use OpenSSL rather than PolarSSL for umurmur
Update polarssl to 1.1.4
Add tvheadend spk
Update busybox and transmission
Update tvheadend

- Remove the beta flag
- Add digests
Update sabnzbd to 0.7.1
Fix for undefined _SC_IOV_MAX
Add oscam
Merge branch 'umurmur_fix' into develop
Update umurmur spk

Fix umurmur not starting in some cases
Update nzbget spk

Fix newzbin URL
split graphics out of basic
ts compiles
javascript does not have block scope
adding replay object
playback added; no line numbers yet
fixed bug with H in drawing.ts
disabling replay for now
hopefully solve the badly signed apk issue
update nearby events logic in chk_user_events for mobile
readjusted mobile css for android selectmenu issue
added HistoryEvent class, created a simple StringHistoryEvent
added HistoryEvent class, created a simple StringHistoryEvent
Merge pull request #1 from danbogert/master

Modified History
fixes for issues 15 - 16
javadoc and source generation package generation
Setup package/project
Add chroma.Color class, rgb and hex support
BioSQL/ PEP8 reformat & cleanup

Reformat all files to conform to PEP8 using autopep.

These commits introduce *no* logic changes, only the formatting standards
from PEP8: http://www.python.org/dev/peps/pep-0008/

All PEP8 standards enabled, except:
E501: line too long

You can generate these cleanups yourself using:

$ pip install autopep
$ find . -type f -name "*.py" -exec sh -c "nice -n19 autopep8 --ignore=E101 -i {} &" \;

NOTE: This will spawn one job per .py file, which should be fine on a semi-fast machine.

Signed-off-by: Nick Semenkovich <semenko@alum.mit.edu>
Up version to 3.8.1

Forgot to update version number printed by --version.
Mark auto-detected configs as private.
Fix inline example button in ExtJS 4.1
Merge branch 'master' into extjs-4.1
Fix class overview toolbar styles.

Add a bit more top-bottom padding to the toolbar.

Move the styles from JavaScript to CSS and document.
Build comments button into the toolbar itself.

Instead of injecting the button to the toolbar from outside, the toolbar
itself manages the button, providing methods to show and update it.

Also the toolbar now fires an event when the comment count button is
clicked - the comments controller just needs to handle that event, not
deal with binding the event to toolbar element after render.
Merge branch 'master' into extjs-4.1
Fix broken HTML in TouchContainer.

Some divs were not closed.

This fixes layout issues when view Touch examples under ExtJS 4.1
Fix config initialization of Device class.

Use initConfig() instead of Ext.apply().

Fixes Touch examples when Docs app is running under Ext 4.1.
Improve show/hide of hover menu.

Fix the issue of hover menu not getting hidden at all when the button is
hovered for the first time and then immediately mouse moves away.
Up version to 3.9.0.pre
Remove isIe fix which is not needed for Ext 4.1.
Scroller fix on Guides
Fix comments for guides and videos.

Guides and videos are now panels, so the comments need to be added to
the panel body element, not the top element.
Merge branch 'extjs-4.1'
Up version to 3.9.0
Don't use EXT_BUILD var in Rake compress task.

Instead pick the build pointed to by template/extjs/

This way the EXT_BUILD var only affects which version of ExtJS will be
used for inline examples.
Update task1_30.cpp
Entity_name('ok')
Entity Instances is still on progress..
Merge branch 'field-management' of git://github.com/Jolly03/SegTDD.git
Add '--no-check-certificate' to wget command.
ignore .orig files from merge
chat window now open in new window
Play sound with notification
src/lib -> lib
fixing image color issues, updated readme
Compose effect
tài liệu + desgin trueCLoud
Add initial rewrite of zshrc
changed to texi2dvi from texi2pdf for Mac
Use name not specific to my setup
Rename rsync scripts
Ensure Job.another_step dont do more steps than Job.total
Merge pull request #3 from sievetech/maximum-steps

Ensure Job.another_step dont do more steps than Job.total
Networked explosions
put the VERSION file in the right place

I don't know why I had put VERSION in GL_ADMIN_BASE, which is pretty
stupid.  It should be in GL_BINDIR.

It also has nothing to do with setup -- the file needs to be generated
at 'install' time.
mirroring without sausages

(or at least without showing the making of said sausages)
additions to default rc (commented out) for mirroring
mirroring: docs and check-g2-compat
GROUPLIST_PGM; manually spot-tested, no test script.  PW.
(mainly for fedora) '-s' gets a shell.  Manual spot-testing only

also includes "use $USER if username not passed"
added 'gitolite push' to make server side pushes easier...

also force the update hook to log SHAs of bypassed pushes
added sshkeys-lint as a command
(minor) comments and clarifications in default rc
install should fail more gracefully if the '-ln' directory does not exist

thanks to EugeneKay for catching this
(minor) add quotes to make repo name stand out in error message
(minor) add a bit more detail on usage text for 'info'
POST_CREATE efficiency... (please read below if you care)

The POST_CREATE trigger is called when

  * a user creates a new "wild" repo,
  * a user uses the "perms" command, and
  * a user uses the "fork" command.

The trigger calls 3 programs (see rc file):

    post-compile/update-git-configs
    post-compile/update-gitweb-access-list
    post-compile/update-git-daemon-access-list

(They are also called by the POST_COMPILE trigger, by the way.)

However, the 3 programs shown are a bit wasteful -- they run through
*all* the repos when really only *one* repo has been affected.

This patch

  * passes the repo name to the 3 programs (duh!)

  * adds the optimisation to the first of the 3 programs listed above
    (the one dealing with 'git config').

For the other two programs (gitweb and git-daemon), you have 3 choices:

  * if you don't have too many repos, ignore the problem.

  * take out the 2nd and 3rd lines from the POST_CREATE list in the rc
    file, so they don't run.

    Then run 'gitolite trigger POST_COMPILE' from cron at regular
    intervals.  (Note that is POST_COMPILE not POST_CREATE!)  However,
    this means that gitweb and daemon permissions won't be current
    immediately after someone adds a new repo or sets perms etc.; they
    get updated only on the next cron run.

  * patch the programs to add this optimisation (and send me the
    patches).  The optimisation would check if arg-1 ($1 in shell,
    $ARGV[0] in perl) is 'POST_CREATE', and if it is, take the *next*
    argument as a repo name that may have changed.
tag lightDOM fragments with 'isLightDOM' flag instead of 'lightDOM'
New Gui and working weights dialog
Merge branch 'master' of https://github.com/sjsrey/pysal-qgis

Conflicts:
	tools/weightsFromShapefile.py
Added missing repos, formatting fixes
Use fpm to create an rpm
Don't get into a bad state if acceptor startup fails.
Macro TIMING: Silence fixnum arithmetic optimization notes on SBCL.
Don't activate the JavaScript that sets the timezone cookie until we
render a page that actually needs it.
Updated doxygen for ingest modules and removed specific pages in favor of package descriptions
Merge changes
add geolocation to transaction history
PCOS message-ID no longer limited to 2 chars
add note about destructor/teardown
grr, hack around rspec weirdness
get rid of flexmock, we don't use it anyway
fork protection: raise exception if connection has been inherited and not reopened

same idea as here: https://github.com/redis/redis-rb/commit/1bd43346cdf71ba69176612714616289a5a70ed4

related to slyphon/zk#26
Replaces merge file filename checking using regular expression. Not tested
Attempt to relayout UI
working moves in 4 direction ith small test routine in State.py
Now featuring Explosions and other cool stuff!

Git it, you hipster!
Initial Commit
First Code Commit
Merge branch 'master' of github.com:snasir/layoverios
nwwe
Update include/mq.h

none
Added EMR logging, clarified bucket profiles
set partitionCount=4
all prototypes: fix html
all prototypes: fixed staffing filter
placeholders for all main panels
updated presentaiton
add route to speaker methods; set component subtype to kAudioUnitSubType_VoiceProcessingIO
new mapping package
bump package version to v0.1.7
Add templates section.
Lots of stuff now included in the odata4j bundle
Changed the extension on the README
Initial commit
Merge branch 'master' of github.com:spencerwi/reverse

Conflicts:
	README.md
merged back in
Add support for reddit-stop event to upstart job.
about was added
second changes
Merge branch 'super_branch'
add contact file with email
add secondary email
index
index:done
5-th string was added

Conflicts:
	mtxt.txt
5-th string was added

Conflicts:
	mtxt.txt

Conflicts:
	mtxt.txt
master again
go back to master
hello was added
huh
почему неотслеживаемый-то?
untracked
test it be now
test it be 2
test it be 3
master is back
master does cool
Fix invalid tag
Move symbol highlighting from semantic to syntactic highlighting

For more performance the highlighting of symbol literals is moved
to the syntactic part of the highlighter.

See commit 2836db63b16a7a02016f7175096c91163c8ad049 for more
information on the creation of the semantic highlighting of
symbol literals.
finished research proposal draft
add iptables redirect port 210 <-> 9000 to init script
Yeap.  Whitespace
FqName class

for type safety, to easier distinguish between:

* short names
* qualified names
* jvm names (slash-separated)
* special names like <root>
* null values that mean "undefined" and "root ns" in different contexts
Move comment above correct function
add cjk USE to sys-kernel/e-sources
Added some interesting git commands I've learned.
added header labels to contact form
Modify sort order for sequencing runs queries
- Sort by sequencing key (ie date), vs integer run#
- Requested by Mindrinos group (Molly Miranda)
tests/: Makefiles: all: grep -v '^ok ' to get less output

ea25ca24-467c-11e2-8c0d-0016d364066c
started working on the splash page.
finished splash page. need to do some testing but looks good in chrome.
added chrome web store logo, made some tweaks to screenshot and install button.
added popover for installing that includes a word about the warning users will get when installing.
made some small suggestions for grammar in the triggered messages.
Merge branch 'master' into grammar
Merge branch 'master' into splash
moved the splash page to the root of the application
uploading the splash page
syntax
using the bootstrap v2.0.3
Version bump 0.4.5
clicking the top bar scrolls to top of the dashboard
clicking on the header rather than on the bar
moved things up on the splash page to accommodate smaller screen rez. modified bottom text to be more concise. added gray install button to repo.
Merge branch 'master' into webintents
avoiding infinite loop
Implemented tile shapes, added first learning level
Merged.
Added box§
Merged.
add dynamic and custom finder method for Flight
Implements Long and Symbol parsing.
Resource completed
* Added gtags.vim
Se corrigio los problemas en el slider y el formato se coloco de manera correcta.
Correcion de alineacion del slideshow
Cal fixes to proposal timezone fix
Fix to not display prior days — this needs to be fixed because we have case which 3>17, for exmaple, 3 Dec>17Aug
SERVER-8021: on v8 OOM, throw instead of abort
Use PrincipalName::getDB() to find database name in introspect.cpp
add repeated method.
add emptyChars field.
add traverseByBreadth method and rename traverseDepth method.
follow method name change(traverseDepth -> traverseByDepth)
add Test for Algorithms class.
refactor traverse methods.
fix bug for finding method.
refactor methods.
refactor tests.
follow refactoring of traverse method.
added fresh gdx project
use io_lib:format for float formatting
remove unesscessary lists:flatten call
remove meck and nicedecimal from deps
remove mention of meck from README.markdown
inline json escaping into encoder
json escape to_json and format by default
add test for dirty_strings
couple new tests for better test coverage in jsx_encoder
style and whitespace
style and whitespace
add test suite for json_escape in decoder
whitespace changes in jsx_decoder.erl
remove old escaping code path
add tests for ignore_bad_escapes
remove decode/1 from jsx_decoder test suite
correct operation of ignore_bad_escapes
add naked single quoted json escape test
add escape equiv test
fix the tenses and forms of option flags
replace old option flag names with new option flag names, and clarify a couple of them
initialize meta tag
More useful help for gem
Rename open_in_chrome to open_in_browser
fixes issue with pushing notification
updated
updated content
added images
added
updated css etc
updated with new pages
updated with new pages content
updated with new pages content
format upate
added nav assistance
chrissy content like full page added
updated formtastic
updated titles
rebaselined everything
illumination is unsigned
adding ctype.i include

needed for floatArray function to be created
removing unneeded %newobject decl

newobject is only for management of a returned object -- it cannot
handle nested structures that need complicated teardown
Update comments and copy author from F4 version.
fixed member avatars on right \o/

STEVE HOLT
hacking @RequestObject
greditor prev and next button
Correct some icon path
hackHiddenFromHomescreen
Generate home screen shortcuts dynamically and make it clickable
nit
Icon for UI Tests app
Inestad of checking hackHiddenFromHomescreen, check for Icon
rename "Mozilla Marketplace (Dev)" app to "Marketplace"
Merge pull request #1579 from timdream/fix-for-demo

Various fix (some of the temporary) for demo next week
Merge pull request #1592 from cvan/bf79120

Rename Marketplace app to "Marketplace"
updated a few projects in itkcmds
meld 13 orphans
ruby-debug gives me lip every time I install or update it. Fired. :(
Less support for older versions of rubygems.
Serious gemfile cleanup.
Reverse menu search order

This is specifically to find the actions bound to modifier + [, {, }, and ] before finding the actions bound to modifier + numbers, since on some keyboards, modifier + number results in one of the brace characters.

This should address issue #374 (although this isn’t a fix per se for the underlying problem of having some key maps result in duplicate keys in the menus).
Add default count to log alias
setting up MAMP
Create the deploy folder if it does not already exist
avoid streaming empty files with bulk loader if sstablewriter errors out
patch by yukim; reviewed by jbellis for CASSANDRA-3946
merge from 1.0
make stress executable
make stress executable
Revert "allow running stress from build classes" and "Add stress tool to binaries"

This reverts commits cb7a931ffcda61392d59c995c6733c20e47c98f0 and 9b746daf7f2d0725b6ebe678dfbedb303b71bf57.
Merge branch 'cassandra-1.0' into cassandra-1.1.0
add back tools/bin after merging revert from 1.0
making stress executable
update CHANGES, NEWS
update stress readme
add time remaining estimate to nodetool compactionstats
patch by Fabien Rousseau; reviewed by jbellis for CASSANDRA-4167
Remove tab
Changing some wording in deployment script.
Updated vital.vim.

Added Data.Base64 module.
Fixes to unmarshaling of Criteria objects.
[#16] Recommend Command Line Tools for XCode
Use chruby to change Ruby versions
fix wrong closing brace
temporarily
Merged conflicts for team
Made a mistake, commiting again for merging reasons
Merge branch 'master' of git://github.com/ErikBlanken/HuSacct-2012
getParentModule working correctly
Merge branch 'master' of git://github.com/ErikBlanken/HuSacct-2012
getChildModulesInModule(String child, int depth) working correctly and connected to the IAnalyseService
update helloworld after add
update again
update README
work on the gremlin distribution to be more lib, bin, etc. like as opposed to the target directory model used previously.
Bug: correct link on user dashboard

The email link was not working correctly as it had no URL argument.
Fix for Steam Linux client
Updated Vim Submodules
demjson requirement
Added back the bluetooth files

Also updating the proj file
asd
Merge branch 'master' of git@github.com:tmk1908/organizer.git

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.indexes/e4/9c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.indexes/e4/a5/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	.metadata/.plugins/org.eclipse.jdt.core/3180259790.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	Organizer/bin/resources/jakub_elfara.jpg
	Organizer/bin/view/MainFrame.class
Tomek, wyglad MainFrame
asd
Merge branch 'master' of git@github.com:tmk1908/organizer.git

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.indexes/e4/9c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.indexes/e4/a5/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload32.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload33.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	.metadata/.plugins/org.eclipse.jdt.core/3180259790.index
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	Organizer/bin/controller/MainFrameEvent.class
	Organizer/bin/view/MainFrame.class
	Organizer/bin/view/View$1.class
	Organizer/src/controller/MainFrameEvent.java
	Organizer/src/controller/WelcomeFrameEvent.java
	Organizer/src/view/MainFrame.java
	Organizer/src/view/View.java
split profile in functions, exports, bash_prompt, use bash_profile for sourcing all others
#04 フィルターを使ってみよう
use delimiter to avoid common hash collisions. make node and data template types
自身を対象からはずすのと最終行が空の場合の対処
add OGC implementating URLs
fix ref to refresh_docs
Merge branch 'master' of github.com:geopython/pycsw into ckan
test summary sith more number
added includes, solving bonus question
starting hw6
Merge branch 'master' of github.com:trammell/csci2033
remove debug flag from redis middleware client create
Linked up sitemap
moved documentation changes from 1.1 to devel
Remove unimplemented headline
Implement adding recipes by web scraping
Update zshrc form rvm.
Bumped version and a host of chnges

Added masking information for 27k probes
Combined 27k and 450k manifests to create level3.symbols based on HG19
Modified runSampleQC to account for platform
Modified buildArchive to account for platform while masking
Relax the restrictions on the gem a bit
Coffee files added (initial)
Added new test and the fix for it
More tests
Added #ends_with_modifier_kw?
Fixed indentation
Don't let @proper[:next_line] go < 0
Added test and fix for begin; rescue; end on same line
Preserve order of ext libs whether they use _lib or _libfile
/
Test
fixes #4103: simpler fix for tfoot in .table-border
add some simple styles for showing white icons on hover where appropriate
refactor parsing code and create header file nc_proto.h
Escape zero bytes in header values.

Fixes #180.
Update Changelog.
cf-sketch: remove debugging info
Made file hints more prominent
- no need for a "rawSection" route anylonger
oops, forgot to add the hogan library
Merge remote branch 'origin/master'
updates to serverbrowser
updates to serverbrowser
two diagrams
Tested Exercise 15
update the docs issues #8
new version of maxent lib
Use the more appropriate PointerType as a base class for ALCcontext/ALCdevice, implement toString() on Context and Device
Changed classpath and manifest to Java 6.
you can obtain the full gazebo model via a script -- the script itself can be improved still
added some constants for appropriate values (i.e. values used in the final robot urdf files)
renamed book_sharing to core
Merge branch 'master' of https://github.com/vegaro/wetradefun into sorin
added account_management.html
Rough draft of account_management.html finished!
base.html draft
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis
fixed a bug in account_management.html
changes to account_management
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis

Conflicts:
	static/account_management.html
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis
changes to accountManagement
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis

Conflicts:
	templates/search_page.html
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis
working on views.py
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis
I believe that I have implemented accept offer, decline offer, and remove listing buttons. I also added the transaction_id field to the transaction model.
11/24/12
committing again...
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis
updated base.html's css path
implement get_link_speed for linux
Add basic JsonObjSerializer incomming
Updated to new villojs.
Scorecards - better validation and handling of incomplete scorecards.
Correcao da correcao
Filtered collection should trigger render
Change name to toJSON.org
mm: extract reclaim code from __alloc_pages_direct_reclaim()

This patch extracts common reclaim code from __alloc_pages_direct_reclaim()
function to separate function: __perform_reclaim() which can be later used
by alloc_contig_range().

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Tested-by: Rob Clark <rob.clark@linaro.org>
Tested-by: Ohad Ben-Cohen <ohad@wizery.com>
Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Tested-by: Robert Nelson <robertcnelson@gmail.com>
Tested-by: Barry Song <Baohua.Song@csr.com>
Use up and down for colder and cnewer
Ignore .env
fixed: cleanup, silence cmake
Included note about second_jul in the module
Inlining TimerCompute code
Extracting recorder from TimerCompute
修正Mini-Web中的Selenium Cases
修正Showcase中的Selenium Cases, 当然也是越改越好了
修正Showcase中的Selenium Cases, 当然也是越改越好了
在showcase引入DATA-JPA和Spring的Profile,江湖從此多事, shiro的FilterFactoryBean就先出問題了.
使用Spring3.1的Profile功能管理ApplicationContext.xml中Production/Dev/Test等環境的區別.
详见: https://github.com/springside/springside4/wiki/Spring
fix cases, i love the jenkinshosting.com.
Fix JPA problem
Fix JPA problem
Fix JPA problem
fix cases, i love the jenkinshosting.com.
Data JPA 实现自定义扩展函数
@Transactional 默认为readOnly=true
Showcase也转为Spring Data Jpa
忍痛删除以前对Hibernate的封装, RC1快发布了。
Fix Cases
Fix Cases
取消根目录的index.jsp
all batch file use English to avoid encoding display problem
数据库初始化改为用maven, quickstart.bat不再依赖ant，另在初始化数据前，会等待H2启动完毕。
操作成功提示信息加入fadeOut效果
open fits file with new feature in fraunhofer
Readme. Implemented v0.2.2
Wslider teste e ainda modificações de nome unobtrusive
Registration ...
Fix var default for attributes.
Fix testDrawNodesReplace.
upgraded smtp client

upgraded smtp client now allows for multipart/related inline attachments

Signed-off-by: Reza Akhavan <reza@akhavan.me>
remove the tip factory methods
Merge branch 'master' of github.com:weejulius/oopsday
recommit the changes
Travis build 3890250 pushed to v3.0
create the initial django project
-  Frank & Konstantin Basisversion (admin) added
- 1. initial merge
Normalize line endings
corrected autocrlf handling in gitattributes
Merge branch 'frank'
removed .settings folder from repo (eclipse)
New saving method for forms
desktop mobile prefix reverted
Fix to load timing for voronoi for footer
voronoi changes for DEVHQ
Jars for other platforms
Start conversion to run against js-doc-parse.

1. Use tree.json from js-doc-parse, rather than generating from XML/XSLT files.
2. Changes because js-doc-parse already converts markdown to HTML and unrolls inheritance chain.
3. Convert to AMD, upgrade to run against dojo 1.7, and use relative paths
4. Removed no longer used files.
所有成员可见自己的door list
发送修改密码链接增加 loading 的标识
assumptions #3
Fixed issue with escaped chars
fixed reset locations.
New Plane Icons added.
Merge remote branch 'upstream/master'
moved jquery.jclock.js to js folder and included jquery.js file to fix clock
Merge branch 'master' into myfixes
Merge branch 'patch-1' into myfixes
ignore lingor tiles
fixed vehicle search SQL
Creates test events.
Added 'add event' button.
Remove depreciated hooks
- New version naming (0.3.0)
- Adopting some ideas / code from FuelPHP, like folder structure
- Preparing code for Pico namespace
- Now only supports PHP 5.3+
no message
Fixed bug C-04 for resource /categories
VIRGO-02 : FullTextSearch for the title of the artefact
Made some order in packages. Ready to go further.
fixed typo in POD
added ->ing_is_vectorwise
remove hg info
change Hide to HideAndReset
Fix teams showing if no team 2
Removing Accept header.
Refactor: standardizing params, adding defaults().

* Standardizing parameters for all methods to (options, callback).

* Removing misguided array parameters (except for realm status, which
  accepts multiple realms).

* Removing misguided string parsing for arena(), guild(), and character().

* Cribbing defaults() from request.
Updating tests.
Updating devDependencies.
Adding a few keywords.
Updating docs.
Adding optional Wowhead fallback for item API.
Switching tests to tap.
Adding basic test for Wowhead fallback.
Bumping version.
[+] Paralelizmus a uvitacie menu

Signed-off-by: xtursky <xtursky@gmail.com>
El proxy funciona con el pase de mensajes... tuve que usar ayuda Sin embargo entendi la idea
Finalizado...
Created controllers

Are not implemented
Design of the database
Controller for user

Operations:
Login => A registered user can loggin
Loggoff => A loggin user can loggoff

This may be http resquest or ajax
Change tabs for spaces
Change tabs for spaces. Included many functions
files for app mobile
Попытка залить проект на heroku.
Еще одна попытка
Еще
heroku
heroku
Add seen_urls.
Update NiuJiaoQi/NiuJiaoQi/Resources/ccbResources/data/contents.json

中间有两个"textureFileName": "njq_s10_mc_grass1", 但少了一个"textureFileName": "njq_s10_mc_grass2",所以我直接把1改成2了
Merge pull request #2 from nickxie82/patch-2

Update NiuJiaoQi/NiuJiaoQi/Resources/ccbResources/data/contents.json
add rb-readline for ci env
Add field and boats which should move over the field
enable deleting snapshots
- 2.17.15
Merge pull request #16 from jsuchome/Code-11-SP3

enable deleting snapshots
ronik made our makefile
Update keywords for compiz
글 읽는 페이지에서 메인으로 돌아가는 링크 삽�
rails_Rubyvilleフィットネスクラブサンプル
Ability to specify custom locale read function
modify: gem versions around libv8
Ignore test directory.
kobuki_udev : some info on using udevadm.
Working asynchronous marker adding. Refactored architecture.
Install UEAstemmer
Check if the data is a string
Update version
remove line typo
Corrected ImageFile depth managment
Added VFF image file reader/writer
Added VFF file to FileService
Import de la mort du celcat calendar
improved error message when an invokable class is not found
Merge branch 'hotfix/sm-tests'
Merge branch 'master' of git://github.com/bartmcleod/zf2 into hotfix/2707
Merge branch 'hotfix/2707' into develop

Forward port #2707
Removed documentation
Merge branch 'hotfix/remove-doc' of https://github.com/ezimuel/zf2 into feature/docs-removal

Conflicts:
	documentation/manual/en/module_specs/Zend_Mvc-Plugins.xml
Merge branch 'hotfix/zend_file' of https://github.com/Maks3w/zf2 into feature/file-refactor
Remove remnant debug information
Merge pull request #2070 from WickedyMike/features/IbanSepa

Remove remnant debug information
Update resources/languages/pt_BR/Zend_Validate.php

Translation updated to EN Revision 25.Jul.2011
Merge branch 'master' of https://github.com/gutobenn/zf2 into release
Merge branch 'release'
New theme options.
change the tree name
fix a map crash
water gamma correction
Merge remote-tracking branch 'scrawl/globalmap' into next
Merge remote-tracking branch 'scrawl/gamma' into next
bla bla bla commit
Merge remote branch 'origin/master'

Conflicts:
	src/main/java/cz/muni/fi/pv168/DBUtils.java
	src/main/java/cz/muni/fi/pv168/PersonManager.java
	src/main/java/cz/muni/fi/pv168/PersonManagerImpl.java
	src/test/java/cz/muni/fi/pv168/PersonManagerImplTest.java
Load the map when the instance is created
Sauvegarde & resto des cookies olcc
adding pond
Update layout to correct some minor location issues
Starts documentation of file Teatime.js, docco style.
The corrected posts from the former blog. Tested locally with jekyll --server, no major problems, all rendered well in the browser.
Added Configuration Class
Replaced projection file for Jakarta floods
signup patch update
removed echo's from tvim cli toggle
+AMath
leftnav & IE
d_do_test should replace slashes with native slashes in TEST_OUTPUT
Fixes Issue 4479 - Better error message when a module with a name different from its file name is imported via its file name.
mpws light: 1.2.6.x - production upload, minor changes, seo, sitemap tool
mpws light: 1.2.6.x - remove unused files
readme client/js
Textile cleanup
Parser&Walker: Escape '[' and ']'
Parser&Walker: Escape '
Permet pasar-li el upgazer que vols actualitzar com argument
Manage thread synchronization
Finance UI almost done
Ignore .pem (AWS secret keys, etc.).
Invalidate attendees cache on attendee save, see #9

* Uses the save_post hook to detect changes (purchases and profile changes)
* Uses $camptix->update_stats and $camptix->get_stats to store and retrieve the last modified time
* Does not bust page cache
Resolution Issue Solve
[app-admin/minus-desktop-tool] added minus-uploader
a lot more convenience functions for graphics, and updated tests. can i start my window manager yet?
Added logging and some tests for misbehaving scripts to userscripts collector
Enabled propagate on logging to get log messages from all classes
Merge pull request #190 from StoneIsle/userscripts_fixes

Userscripts fixes
Fix for bad usage of _send in graphitepickle.py
Merge pull request #191 from bunjiboys/pickle-send-fix

Fix for bad usage of _send in graphitepickle.py
Make debian prerm not fail if diamond is not running
Add prefix to Riemann events

Otherwise, in Riemann, there is no way to differentiate Diamond events from other events.
Merge pull request #192 from bfirsh/prerm-ignore-failed-stop

Make debian prerm not fail if diamond is not running
Merge pull request #193 from bfirsh/riemann-events-with-prefix

Add prefix to Riemann events
Move away from using the with statement for 2.4 support
pep8 fixes
Add in more deps for testing
Doc updates
Fix try-except-finally statement for python 2.4 support
Fixes #189, this makes the batch size default to 1 if not set
Blank CHANGELOG
*** BREAKING CHANGE ***
This changes the default byte unit for diskspace, network, and snmp interfaces to their basic units (bytes/bits). This will change your metric paths if you haven't hardcoded a specific setting for these collectors.
Update the changelog
Change to using threading.Lock instead of threading.Condition, and check lock state before trying to release it during the finally block
Update tests
for Version beta1.1 publish
case sensitive name change
removed optional arguments
added optional parameters
Updated and added BlockPattern class for future feature
add role columns
TODO
License
Remove the annoying and fairly useless ace-jump-mode
Add ack-and-a-half (use homebrew to install ack on osx)
Trying to enhance time estimations
Updated code syntax for css
moving work on arrow back to onyx
changes class name, and readme
update ROMManagerManifest