labofsahil/github-event-dataset-2012 huggingface dataset:
[s1617] Refactor Unit kills Creature case

Add method Unit::JustKilledCreature to include code of killed creature case in Unit::DealDamage
[s1618] Implement SummonPossessed

Version slightly derived from GriffonHeart's version.
[s1619] Let PossessedSummons despawn on Channeled-Aura interrupt

Maybe this mechanic should also be used for normal possessed mobs, but then their special handling must be removed
Also not entirely sure if this a great place for this code to be - but I didn't catch a better suiting one

(based on commit 65d4f03)

Signed-off-by: Nighoo <nighoo@overninethousand.de>
[s1620] Interrupt possessed channeling when possessed dies

(based on commit 44a472b)

Signed-off-by: Nighoo <nighoo@overninethousand.de>
[s1621] Fixup commit 12043, My bad. Thx to Reamer for pointing

(based on commit 427fb1e)

Signed-off-by: Nighoo <nighoo@overninethousand.de>
[s1622] Add grayard linking/ unlinking support

(based on commit fb1392b)

Signed-off-by: Nighoo <nighoo@overninethousand.de>
[s1623] Fix a bug of [s1411] that causes wrong offhand attack times for players.

Thx to fr1nge for reporting the bug.
Problem spotting and patch by vovk
Additional cleanup by fr1nge

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>

(based on commit 1d34fb3)
zoning map layout to one column, two rows
zoning map layout to one column, two rows
zoning map layout to one column, two rows
show parcel properties in map info popup
show parcel properties in map info popup
show parcel properties in map info popup
add list_implode
fix #21
Merge pull request #28 from sdikiy/fix_21_v2

Fix #21. Report and pull request provided by sdikiy.
drag and drop function to reorder lists on pkg framework using jquery.
also new features like base64,description, tooltip custom texts.
tested with sorting features too.
related post on forum
http://forum.pfsense.org/index.php/topic,49322.msg264514.html#msg264514
Added VCScommand plugin
optimization(update-photos) better image compression.
Basic Map, Area, Garrison models plus some tests
Added FluentSecurityBootstrapper to project - placeholder to review with Team after the user domain / query is sorted
Fix tests to properly parse csrf cookies
fiddled with settings to make them work on the raspberry pi
changed cron
1-minute pings
removed un-needed files
Merge branch 'minutely_pings' into develop
removed unnecessary files
gitignore
init scripts
changed to check actual width/height scale rather than whole pagesize.
一応tmux.confつくったけどなにも書いていない。
REV-2012-10-11/2 Ajuste en la paginacion

Ajuste en el componente para paginar fotos
adding code coverage flag
make api names more consistent
add some rudimentary param validation
Image asset upload and display (bug 744648)
feincms_nav: Fix regression with level=somewhere deep in the tree

Thanks to Daniel Mettler for the report.
Fix RichTextField form field generation.

All standard properties that would affect formfield were being ignored
(such as blank=True).
No need for 'position' field to be mandatory.
Also conditionally use content.position in ImageContent template.
Fix oddity in docs.
Fixed psges priority for sitemap
Fixed pages order in sitemap
Avoid explicit references to Page in PageAdmin
Allow FEINCMS_USE_PAGE_ADMIN=False to avoid registering default Page admin.
Allow feincms_nav to work with non-default Page models.

 -- unless no feincms_page in context; need to figure out best way to
    handle that. Maybe an additional argument?
Remove explicit use of page.Page in views; customise via page_model_path arg.

 -- needs docs.
Decouple PageAdminForm from The One Page model. See #241.
Docs: fix typos.
Add a note concerning FEINCMS_USE_PAGE_ADMIN
Merge branch 'site_map_fix' of git://github.com/PSyton/feincms

* 'site_map_fix' of git://github.com/PSyton/feincms:
  Fixed pages order in sitemap
  Fixed psges priority for sitemap
Merge branch 'master' into next

* master:
  Fixed pages order in sitemap
  Fixed psges priority for sitemap
  Fix oddity in docs.
  Fix RichTextField form field generation.
  feincms_nav: Fix regression with level=somewhere deep in the tree
Merge branch 'next' of git://github.com/pjdelport/feincms into next

* 'next' of git://github.com/pjdelport/feincms:
  Docs: fix typos.
except ValueError on siblings_along_path due to page pretenders
get navigation extension working again
Add a few alters_data attributes here and there
bugs
Merge branch 'master' into clear_add_feed
Merge branch 'master' into clear_add_feed

Conflicts:
	.ditz/issue-6f6a72dfe5d1d6754de23b885effd8bfe98462e2.yaml
whoops!
the error message from css param is annoying me.
starting the fix
bugs
remove loggin
Closer to fixed
OK - looks like saving and refreshing and the like works!
bugs
chef-full is new default
Merge pull request #45 from mattray/KNIFE_EC2-56

KNIFE_EC2-56 chef-full is new default bootstrap template.
added instance tagging based on https://github.com/jlindsey branch
Always set Name tag on server create.

The Name tag should ways be set to one of the following

(1) an explicitly set Name tag passed with --tags,
(2) the node_name set with -N, or
(3) the instance id of the ec2 instance.
Add tests for new tag features.
KNIFE_EC2-18: Add option to set instance tags on server create.

Merge branch 'moxiespaces/tag_on_create'

This branch adds a --tags options to ec2_server_create
allowing the user to set custom tags to instances.  It
also sets the Name tag to the instance_id or chef_node_name
unless otherwise specified.  Tests included.
Bump chef version dependency to => 0.10.10

Chef 0.10.10 is required in order to use chef-full as
the default bootstrap template.
Bump to 0.5.12 for release.
Bump to 0.5.13 for development
Fix route 24 vs midnight bug
bigger voxel mesh
Added License and GitHub link
modifications de ScalaInt (operateurs) + tests associes
Merged of refactoringOperators on master to HEAD
Convert tests from RSpec to MiniTest
Update README
improved ranking fragment method
Added commandline argument to set the Status

Check default help for usage
Fixed patient ID search
Snapshot of a source and reference source directory browser
Update cpp-files.sh

Added a condition that will check whether the directory $program_name 
already exists. If it exists then it gives an error because we 
won't want to add files in a directory that already exits 
(may be user is using it for some other purpose). I hope you like that 
change and include it in your script. It's a great script, we can
enhance it and make a script that works on design patterns just write what
pattern you want to use and files are created in same manner. 
Merge pull request #1 from inderpreetsingh/patch-1

Update cpp-files.sh
Added core module and refactored jgroups and jgit modules into it
Revert "MB-5908 queue and dequeue flushing items in LIFO ordering"

This reverts commit 4c9457740bae7192ee89f239f8852f88a9b0f043.

Change-Id: I6e727c3f6f04571b83d3984f965cad0e4627794b
Reviewed-on: http://review.couchbase.org/18596
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
MB-7049: Keep messages in time order for memcached logs

Change-Id: I084faac517778d33325ad95c0215b61d62eb7c9a
Reviewed-on: http://review.couchbase.org/22087
Tested-by: Bin Cui <bin.cui@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>
[mine-server,ha] Added base cookbooks.
[ha] Added stubs for configs and recipes.
[ha] Just stub content in files.
[mine-server] Bugfix.
[balancer] Added role and recipes.
Merge branch 'lvs' of github.com:menrcom/chef-repo into lvs

Conflicts:
	cookbooks/ha/recipes/default.rb
new file:   git/git.txt
Checking out id param
Finish user signup
Add SSL in production
Make description the only text field (required). Title is optional
title and description were switched. Fixed now.
fix for strange promise callback chain bug
regress: changing back to original import structure
use proper identifier

though the keyspace is flat anyways
render error in boards controller
revert to parameterized inheritance
render not found when using bogus board id
move jasmine specs to subdirectory
start the server side board spec
make redis base model
wip on Player model
spec for base redis model
WIP: Stuck on Board#white_player_id spec
merged with svevang/feature/unguessable_urls_import_structure
Une première compilation
Fixed some overflowing issues.
Remove dvdread_incdir

dvdread_incdir is redundant when configure2 already has incdir and it
seems that naming convention is more in-line w/ the rest of the script.
Fix endian detection output

When bigendian was detected it was not being written to config.h because
the test lacked the file output redirection.
Believe config.h instead of trying to detect endianness

A few macros in md5.c were in that file trying to detect endian when
that wasn't necessary. config.h should already know what endian the
compilation is for. This commit uses config.h instead. Patch kindly
provided by Ganael Laplanche
<ganael DOT laplanche AT martymac DOT org>. Thanks!
fixing remote helper invocation
associating a patient with a manager from the patients page
Use libSVM to get a model of the letters.
guys, index page is a thing
v2.5b pushed
initial files for local repository features
added transmission
cleanup, added glossary stub
c
Merge remote-tracking branch 'origin/dev'

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/devise.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	tmp/pids/server.pid
Fix up the debian guest to work with the new machine API
Docs5
fixed typo in POD
Merge pull request #7 from tokuhirom/master

typo in pod
Add organizer invites person
Add organizer invite grooup
reset iconsize to defaults
Query the platform we're running on.
Do not add mnemonics on Mac since their usage is discouraged in OS X, because mnemonics violate the principles of OS X Human Interface Guidelines.
Build application bundle for Mac and integrate better into the system.
Do not add Quit and About menu items if running on Mac. They are already included in the Application menu.
Rename About menu to Help so the search field gets automatically added to it if running on Mac.
Store the configuration in the user's home on Mac and Windows.
Add some accelerators that use the correct modifier key on all platforms.
Dialog should be relative to its direct parent.
automation of svm on 2 age groups. To run it, cd to each folder(18to47 and rest), call ruby test.rb. Results are the text files. Detailed result file description is in source file test.rb
Убрал лишний параметр

Убрал -v у svn st, без него нормально работает.
first EJB application - source
PluginInit must be extern C
Finshed framework for OS abstraction and added windows abstraction for MsgBox
add meiboadd
Listing users works

Used GString instead of gchar* - probably pointer issues.
pro file adaptations
Todos los arboles extiendes la clase abstracta Arbol
Databasen uppdaterad
Change found_hosts from a list to a set.
Rewrite of ds_zone_walk, bugs still exist.
Added functionality to set an option in .vimrc to specify the filename that is displayed for the scratch buffer
New option (g:scratch_bufclose) and new command to open scratch in a new tab.
Merge branch 'ikirudennis'

Conflicts:
	README.md
	plugin/scratch.vim

merged ikirudennis branch, added :Tscratch and user options

With this merge we add the :Tscratch command (open in a tab) and we add
a couple of user options g:scratch_filename (to choose the name of the
scratch buffer) and g:scratch_bufclose (to choose if the buffer gets deleted
when closed or not)
holy shit it works (readme added)
修改錯誤訊息顯示

1.keyup之後能將錯誤訊息卻移除
2. 儲存時，正確顯示錯誤訊息
gib ruf
new looper
msg: so there
lvがない環境ではvim read onlyで
colordiffがあれば使う
dstatの簡単オプション追加
Modificacion de la ruta de la documentacion
Ashok | #2178 | Modifying the jasper sql validation properties before installing jasper.
BalajiN, shruthi | #25 | Redirecting to patients list page after saving adherence
Shruthi, BalajiN | #25 | Allow updating adherence
V2 | #00 | Fixing build as filename change didnt get picked up by git
Vishal, Preethi | #4 | Implemented auto complete on district drop down.
Luka | #0000 | More functional tests have the Autowired beans removed. They use patient.jsp to create patients. One more to go!
Luka, Preethi | #82 | Added ant target to load.seed.data
Abhishek, BalajiN | #0 | Fixing build
Luka, Dheeru | #146 | Showing reason for pause as a warning message on the update adherence page. Removed day-wise adherence colouring for treatment-pause.
Answered query for question 9.
Merge pull request #517 from erikvold/bug-777813

Bug 777813 Implement per-window private browsing getter r=@gozala(cherry picked from commit b1c80d195c33bdb8163ec5836db36f4e6712833d)
Revert "upgrade to iconv 1.2.1 which has a drastically improved build system - 1917"

This reverts commit 64cc6a9ba4accc15f845ddd639e4b3b2b4f24be5.
disable debug language in our dev env for now.  it was never working right, and was relying on obsolete .json files.  Now that those are gone (see PR #1918), we can see that things were broken.  See issue #1970 to track the fix
don't bring the server down if en_US mo files don't exist
Merge branch 'dev' into api_param_validation
Update post-update.js so that it exits with the same exit code as run-all.js. Depend on this exit code making back to testy eventually so that test_selenium can exit with the same exit code and travis correctly marks the tests as pass/fail.
Temporarily disable most tests/browsers so we don't run out of sauce time.
Use a GET request when requesting selenium results
Start the verifyEmailAddress page controller even if there is no token.

To test:
* Make sure verification works if a valid token is given.
* Make sure error message is displayed if invalid token is given.
* Make sure error message is displayed if no token is given.

issue #1495
Merge pull request #1520 from mozilla/issue_1495_missing_verification_token

Start the verifyEmailAddress page controller even if there is no token.
moved user interest profiling into the addon
changes to appViewer and main to start using user profiling
Merge branch 'master' into newdev
removed window.rebuildInterets( ) API
fixed code-style issues
moved newtab_test.html to test nd modified appViewer to use people.mozilla server
Merge branch 'master' into newdev
changed to new licence
removed hardcoded test url
moved newtab_test.html and odp2mozilla.json to examples
Merge pull request #36 from mzhilyaev/newdev

Add interest profiling history analysis logic into the add-on instead of giving fixed/fake recommendations.
Removed watermark
more on login screen
syncing to adjust to margin changes
Option guard on mv invocation
Documentation of necessary algorithms for manual snap.
Added new README.* file regarding the purpose of this fork
Commit back lost changes in CheckPrereqs activity
Refactor config/connector related stuff to use new API (get_* methods)
Extendend openxpkicmd to restart exisiting workflows
Allow call parameters with  walkQueryPoints
Use new "deep fetch" feature of Connector::LDAP to retrieve login ids
Add qatest scripts for SCv4 workflow
Split up Connector for Card-Status and Card-Employee-Assignment
Fixed documentation
Fail with exception if no smartcard info is found
Rename connector method getWrapper to get_wrapper
Add/Fix logic to record employeeid to certificate assignment
Updated Testscript for SCPers Workflow
New Connector based publishing for Smartcard Workflow
Fix wrong usage of serialization
Allow empty publising target list
Extend Test::More to run arbitrary API commands
New activity to calculate the PKCS11 key id from a certificate
Add missing files to MANIFEST
Fix spelling bug (critical)
Explicitly set userinfo_employee_id and use mail instead employeeid as workflow_creator
Al aplicar un pago valida que no existan pagos guardados

Signed-off-by: MIGUEL <miguel@miguel-Satellite-L635.(none)>
adding express.conf for root user as well to assist with automated tests
Merge pull request #471 from abhgupta/abhgupta-dev

Merged by openshift-bot
fixing syntax error in for loop
Fix for bugz 856487 - Can't add mongodb-2.0 for ruby1.9 app successfully.
Merge pull request #477 from abhgupta/abhgupta-dev

Merged by openshift-bot
fixing setup for express.conf
The chkconfig test no longer works on F17 and was no longer needed once port-proxy moved to Crankcase
Merge pull request #478 from ramr/master

Merged by openshift-bot
Updating gem versions
Automatic commit of package [rubygem-stickshift-node] release [0.16.9-1].
Automatic commit of package [cartridge-jenkins-client-1.4] release [0.32.3-1].
Automatic commit of package [cartridge-mongodb-2.0] release [0.25.4-1].
Automatic commit of package [rubygem-stickshift-controller] release [0.16.5-1].
Automatic commit of package [stickshift-port-proxy] release [0.2.4-1].
bump_minor_versions for sprint 18
Updating gem versions
Automatic commit of package [cartridge-jbossas-7] release [0.98.1-1].
Automatic commit of package [cartridge-phpmyadmin-3.4] release [0.20.1-1].
Automatic commit of package [cartridge-diy-0.1] release [0.33.1-1].
Automatic commit of package [cartridge-haproxy-1.4] release [0.16.1-1].
Removed bracket highlighter
解析器module的数据结构
解析器module的数据结构
Added E120
Fixed nullpointer exception
Merge branch 'master' of github.com:mushuit/tda367-10
Put a .toString in the tetrominos
issue #1425: corresponding changes for .pkg files
FIX #10 
implemented equals
Merge branch 'master' into ticket6_junit
Added working junit build

See
http://mukis.de/pages/?p=263
First part of tests converted
doc: parens around issue links
doc: Types, Errors
Revert "Move main function into the main method of a class"

This reverts commit d5e5e6d16d92d210136e0242112a88231f1e5c05.
Add testing of argument parsing
Update release number on upgrade
editing of tables now returns values to form.
need to fix checkboxes and select box
longest substring matching, DFA & NFA lookup
longest substring merge
Alpha not working
- finishing up the code, saving servo position in EEPROM, comments and other minor changes
- Cleaned up DXF file
Update gems
Update devise
Adding party groups to RIF-CS feed.
some concept has added
Update inc/template-tags.php

line 131 replaced '_s' to 'dsframework'
Unity File Updated
Electrolyzer textures and wrench support
about
Merge branch 'dev'
sitemap gen
Fixes #88.
Switch to using a green checkmark on the left vs the blue checkmark accessory view (Issue #98)
Remove "halo" and blurry text when "halo" is removed (titleShadowOffset).  Fixes #60.
Improvements to row selection.

* Row height is no longer animated, so modalities don't overlap buttons for a split second
* Separator, new person button, and timestamp are not faded out/in -- too jarring
Indent non-selected sensors in the recent sensors list.  Closes #98.
Don't need to ask for cancel/allow when we just want to annotate.
Autoresize mask for date, edit button, delete button should hug right, improving appearance in landscape orientation.
fix #099 Sensor check issue

WSDeviceSetupController.m
Issue was when checking for sensor, after requested modality isn't
match what the service provide, the function still continues to check
sub modality. It is not correct.  Added isSensorOperationCompleted flag
to stop the process once modality check failed, doesn't need to
continue.

WSModalityMap.m
Typo for return string for kCaptureTypeRightThumbFlat and
kCaptureTypeLeftThumbFlat.  Both were returned LittleFlat instead of
ThumbFlat.
Change the parameter name on selectItem since it is indicative of the opposite of what the message actually performs.
Re-fix #89 after regression in f579601a587b71da226e53a100ff9372768e9e2f.
Break out front/flip side transitions to their own messages while adding an annotation state BOOL.
Missing from 4ba19ef326c344e535b86bee3666cd1f5f6d91fc.
* Fixes #101.
* Remove dependency on UIView+FlipTransition, making the flip from front to flip of the CaptureController more fluid, more directional (right to left to right), and with no framing issues.
Correct regression in 5268a1335ef7a782c703e13c8c288b13546851b0 where if annotating and another modality was selected, the annotation screen for the new modality would still appear.
There is no viewWillUnload.
Use springboard badge background.
Fix #86 by adding 84x84 and 168x168 modality images, removing unused modalities.  Images courtesy @nbcl-kkgreene.
woops extra quote literals were commenting the entire file out
Extend control hook framework

This commits adds a new error code that can be return from a
registered control callback: USBD_REQ_NEXT_CALLBACK. This return code
signifies that the callback is done processing the data successfully,
but user would like to have all matching callbacks down the callback
chain to be executed too.

This change allows for example to intercept standard requests like
GET_DESCRIPTOR, do some small action upon receiving of one, but still
have the standard callback executed and do it's job. This way user
doesn't have to re-implement standard GET_DESCRIPTOR functionality if
they want to intercept that request to do some small thing.
Further re-factor USB string handling code

This commit refactors USB string code, making it, hopefully, less
buggy and more easier to understand. It also removes "magic" bit
manipulation and "magic" numbers;
Ignore errors from commit, begin, and drop commands
Adding Test Scripts for serving as test cases on server
Add unicode automatic link test case.
check in aws config
Merge branch 'master' of https://github.com/netik/showmanager

Conflicts:
	README
Adding retina.js to index
1. 将配置工具的系统配置文件还原成原始状态，并对相应结构体进行了扩充，
   这样就不需要修改配置工具；
2. 在prepare.go中增加了一个接口OMInputParams()，主要是完成对
   SysConfig.xml中有关文件映射部分的解析, 然后查找所有相关的
   服务器类型，进而在前端显示页面上进行过滤显示；
reverted back to the 'hardcoded' config directory
bed3 support fix
Added fields to save the Authentication Token for the User
buildan
Quick revision to the Form Element validate method
Revision to the Project Install component re: bootstrap and controllers
added tests
finished static pages
add resources,
main execution doesn't work
kadmind iprop debugs messages should go to stderr
Add -p, -F, and -C options to kadmind

-p path-to-kdb5_util
-F dump-file
-C path-to-kprop
ipropd_svc.c back to normal
Update kpropd.rst
Deprecate kpropd -S option
kdb5_util load needs iprop safety net
Add -R option to kproplog to force full resyncs
Prep k5test.py for iprop (add start_kpropd(), ...)

Add a start_kpropd() method to K5Realm and make start_kadmind() use the
kadmind -p, -C, and -F options.
Import Greg Hudson's iprop test and get it closer
Stop returning UPDATE_BUSY

Currently kadmind allows slaves to poll for updates as often as they
like, but not within 10s of the last update.  This means that iprop will
appear to fail to synchronize the KDC at any site whose master KDC
processes at least one write transaction every 10 seconds consistently.

The original intention must have been to throttle iprop clients (slave
KDCs) that poll too often.  But UPDATE_BUSY as implemented is not that.
Remove "kpropd: " from logs; always openlog()
Cleanup some debug/syslog msgs and C style
Stop localizing log msgs; debug msgs to stderr
added automatic twitter follow
made the ultimate question utilize regex
escape message body in URI string
Fixing profile.
Merge branch 'maquetas' of github.com:niwibe/Green-Mine into maquetas
Menu improvements.
initial aggregation
Fix typo in contents link.
[PORTTISK-890] backend returns localization keys instead of localized messages on error situation - added the values for the keys
[PORTTISK-890] backend returns localization keys instead of localized messages on error situation - added the values for the keys
Merge branch 'feature/PORTTISK-890' into develop
[PORTTISK-890] Push publish menu to front
Merge branch 'develop' of ssh://haisuli/Oskari into develop
[PORTTISK-890] Revert push publish menu to front
[PORTTISK-890] Push basic publisher 40px to the right (to avoid being hidden by the yellow thingy
[PORTTISK-870] CSS slimmer
[PORTTISK-870] Don't load individual CSS files if preloaded()
Merge branch 'develop' of ssh://haisuli/Oskari into develop
[PORTTISK-870] Revert CSS preload
[PORTTISK-870] Retry CSS preload
[PORTTISK-870] Fix URLs in CSS
Merge branch 'develop' of ssh://haisuli/Oskari into develop
[PORTTISK-896] gfi requests refactored, deprecated code removed and myplaces/toolbar now try to enable/disable gfi so it doesnt bother users when drawing to map etc
Merge branch 'develop' of ssh://haisuli/Oskari into develop
[PORTTISK-896] removed commented out code
[PORTTISK-896] no longer used, moved to deprecated
[PORTTISK-896] fixed trailing comma
Merge branch 'feature/PORTTISK-896' into develop
Add Usage/Installtion

and cleanup the markup
try to fix wrong image width for screens which are 320px wide.
Added method to reset root view controller to TTBaseNavigaor
[fix] npm packages
Fixed module error with a macruby specific version of the json gem. Then encountered __FILE__ compiling to my specific computer directory on another machine. Fixed with $0
recherche du modérateur à avertir
DB populator working. Demo view in place. Relationships between various objects pretty much set for now.
wbs

alpha verze, nutno zkontrolovat doplnit
Allow calling mock_graph & mock_fql without block.
ref issue #281 in fb_graph
NOTE: This might be reverted later.
Merge branch 'master' of github.com:nov/fb_graph-mock
Rebrace icon SCSS
Rebrace form SCSS

Removed redundant parent selector (leading & then space).
Readablity: Moved all property declaration to their own lines.
Combined selectors where applicable.
Use existing sprite for mailto icon
Remove unused mail icon
Revert change to icon Sass
Added ability to disable the Basic HTML version/Standard version link in settings.js (not recommended for most scenarios).
Resolved merge conflicts
Removed extra comma from settings.js
Resolved merge conflicts
Merge pull request #642 from nschonni/reuse-mail-sprite

Reuse mail sprite
Merge branch 'v3.0'
Resolved merge conflicts.
Rebrace PE formvalid SCSS
Rebrace PE footnotes SCSS
Rebrace PE feedback SCSS
Rebrace PE lightbox

Further optimizations available but they would affect the upgrade
ability.
Rebrace PE share SCSS

Combined some selectors
Follow up note for PE sessiontimeout SCSS
Refactor PE progress SCSS

Combine selectors.
Shorten HEX colour codes
Refactor PE prettyprint SCSS

Combine selectors
Rebrace PE slideout SCSS
Refactor PE slider SCSS

Combined selectors
Refactor PE tabbedinterface SCSS

Combined selector.
Should use extend for gradient in the future.
Refactored PE zebra SCSS

Combined selectors.
Cleaned dead code.
Left commented out section that had note attached.
Fixed typos in Session timeout working examples.
Convert css imports to Sass imports

Fixed encoding in meter.scss
Merge branch 'v3.0'
Merge pull request #597 from nschonni/sass-import-base-theme

Convert css imports to Sass imports
Rebuild calendar-min.js
Additional DNS infos.
Fixed compilation warning.
Fixed another compilation warning.
Beginning of Parser project.
Removed 64 bit issue.
Merge branch 'windows' into windows_error2
Fixed a bug in ByteStream_v4_Util.h
Continuing development of PDF code.
Merge branch 'windows' into windows_error2
05 database mail practice and examples
refspec: expose the force update specifier through git_refspec_force() accessor
remote: Make git_remote_add() generate a default refspec with a force update specifier
Stop setting etc_dir in node data.

Switched to setting zabbix_agentd -c ... option in the init script to resolve the issue about where the zabbix_agentd config file goes.
UniformGrammarDistributor.py - Generates variations of a given grammar
Update src/Applications/PuncFeatures/FirstOrderTransitionWord.java
EKaiserUtil初始版本

2012年11月26日
nzlov提交初始版本
Removed version file. The file should only be on production server.
A helper method to detect database from a DataSource
A method to request shutdown of an in-memory database.
Added a function for converting identifiers to the case required by
the database. Used this new method for discovering columns in copyTable
function.
Saving changes for be able to continue next time
sync yp
Emit an 'end' event when a song has finished playing.
Bug fix (replace show with css opacity setting)
resize to 480
draft20121028
Renames Plugins to Core.
Adds Types.  Necessary?  Wise?
Changes some Auth imports to Type imports.
Remove disqus comments

They're now added by the plugin itself using ckan_extends.
Re-arrange footer. 
Live filter for dataset selector.
Update openspendingjs submodule
* Fixes minor bug: there's no property style.backgroundPositionX. Changes to backgoundPosition.
remove_assistant:  even if box is unconfigured do not try to adress assistant-pages but home, by MaxMuster (refs #1838)

git-svn-id: file:///var/svn/freetz/trunk@9792 149334a1-2f27-0410-a3b9-fc62619ac1e6
mxsup686: Modififactions for new production server
tutorial: Pointer cleanup
tutorial: Expand the section on vectors
tutorial: Add a section on common vector methods
tutorial: Add a few words about shadowing
tutorial: Typo
Merge remote-tracking branch 'ben0x539/incoming'

Conflicts:
	doc/tutorial.md
Add Benjamin Herr to AUTHORS.txt
tutorial: Cleanup
Add the Alioth chameneos-redux benchmark

This adds a Rust implementation of the Alioth chameneos-redux benchmark:
http://shootout.alioth.debian.org/u64q/performance.php?test=chameneosredux

This version already seems faster than Clojure, Ruby, and OCaml. I'm running
with N=6,000,000 in about 1m 50s.  Further optimization would be good, though.

I'm talking right now with @eholk about how pipes could be used (this is 1:many)...
Add improvements suggested by erickt and bblum
Increase the difficulty of chameneos-redux under 'make perf'
tutorial: Add section on classes.
Merge pull request #2838 from gwillen/tutorial-class

tutorial: add classes
Add Glenn Willen to AUTHORS
tutorial: Put class warning in a blockquote

Style it like other such asides
tutorial: Use a more tasteful blockquote style
tutorial: Describe blockquotes in the 'Conventions' section
tutorial: Fix capitalization of header
Revert "change borrowck error msg: 'declared in outer block' -> 'captured in a closure'"

This change requires some tests to be updated.

This reverts commit b5b8f5efccc3f39be807dd2e060e913ff263b73d.
tutorial: Make class example compile
FIX: los heigth no son necesarios
HOTFIXS
Navigational methods have been changed to return True or False based on user's permission to view certain sections of the ui. Also did some docstring changes.
More docstrings updates.
Tip: format to FAT32

Signed-off-by: Mailson Lira <mailson@gmail.com>
Copy the absolute path of a given file/directory

Signed-off-by: Mailson Lira <mailson@gmail.com>
Fixes an xcode upgrade warning.
Fixes an unused variable warning.
Performance mod.
add humgarian keyboard data
GDA-5155 add setInputNames and setExtraNames to configure() so the
device name will be used to over-write the default 'value' name.
add a new constructor so one can set name and PV at instantiation
Merge branch '1.0' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git into 1.0
git-svn-id: https://scm.gforge.inria.fr/svn/openalea/trunk@3638 04ea39c6-a500-0410-8508-e77fe2a861cf
Added some of the newer countries and fixes

Netherlands Antilles (AN) has been split in to new countries but has
been left in for compatibility with some shippers. Probably needs
removing in the future.

Canary Islands (IC) has been added despite not being a official code
only reserved. The 3 letter code ICA is not official or reserved. Canary
Islands (IC) is used by shippers and although part of Spain is not part
EU VAT region so can not be under ES.

Isle of Mann (IM), although a country, has been added under the United
Kingdom as it shares the EU VAT prefix GB and VAT numbers with the
United kingdom. It also shares postcodes and shippers treat as part of
GB. Probably needs adding as a county in the future and translating IM
to GB in the shipping modules and VAT validation.
Merge pull request #273 from ADDCreative/patch28

Added some of the newer countries and fixes
CSS

tweak to data class
CSS - eventComments added

new class for event comments
[OE-1876] allow datepickers to default to null
Merge branch 'release/1.2-moorfields' of github.com:openeyes/OpenEyes into release/1.2-moorfields
User Guide WFS Output Formats - editing, updated content, links
Merge branch 'master' of git://github.com/geoserver/geoserver
toolwrapper (bash) development update
this svg-prints the 'marked' faces as dashed lines, revealing CGAL issues
with mark() and union() operations on Nef Polyhedron 2 objects.
point README build instructions for linux/win to Wiki site
Update notes for submitted changes

* Changed "Delete volume" success message text
Merge "make setup.py execute with python by default"
Merge "Add link to instance for its id in floating ip list"
Open Grizzly (2013.1)

Bump version number on master to open up Grizzly development.

Change-Id: I3a71a2aaa0519501ae64d9f00f1b45398502445a
pin sqlalchemy to 0.7

The sqlalchemy package 0.8.0b1 released on October 30, 2012
removed SQLSoup

(http://docs.sqlalchemy.org/en/latest/changelog/migration_08.html#sqlsoup)

Ensure that the SqlSoup import is still supported. A number of quantum agents
make use of this code to access the database.

Fixes bug 1073555

Change-Id: I78b27716c6e3eb05d874314f0bc544a917fd5853
Update notes for submitted changes

* Remove default name for DHCP port.
Update notes for submitted changes

* support 'send_arp_for_ha' option in l3_agent
Update notes for submitted changes

* RestClient: Don't hard code volume service name.
annotate models
able to create images
switch to opentox-ruby version 4.0.0
Merge branch 'release/v3.2.0' into development
Remove product-specific fields from device info

The following fields have been removed from the nyx_device_info interface
as they should be reconfigurable without requiring a different build:

  NYX_DEVICE_INFO_CARRIER
  NYX_DEVICE_INFO_DM_*
  NYX_DEVICE_INFO_PART_NUMBER
  NYX_DEVICE_INFO_PRODUCT_SKU
  NYX_DEVICE_INFO_PRODUCTION_NAME
  NYX_DEVICE_INFO_PRODUCT_NAME_SHORT
  NYX_DEVICE_INFO_PRODUCT_NAME_BRANDED

Open-webOS-DCO-1.0-Signed-off-by: Sapna Todwal <sapna.todwal@palm.com>
Open-webOS-DCO-1.0-Signed-off-by: Keith Derrick <keith.derrick@palm.com>

Change-Id: I75ea4da92fe816daae3c2a0e5b11b21b197670c5
Fix mySQL init syntax for engine

Since mysql 5 the engine must be specified using "Engine=", mysql 5.1
tolerates the old syntax while mysql 5.5 fails.
move steps topics for resources to step_resource
action :action
some edits to role/environments endpoints docs

renamed two files for better grouping in source
gplcver: style nit-picks
Revert "Always build bottles universally."

This reverts commit 72a477f2734939d4c5805247588c4cdea69b5383.
duplicity 0.6.18

Closes #10834.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
New external dependency implementation.
Use new Requirements code in Homebrew
Use new Requirements in formulae
pg-tap: restore skip-all
roll back stricter version check
Use HOMEBREW_REPOSITORY for freshness check

Homebrew itself is found under HOMEBREW_REPOSITORY,
which *may* be the same HOMEBREW_PREFIX, but does not have
to be if you link brew into /usr/local/bin from another location.
OpenBabel 2.2.3

Open Babel is a chemical toolbox designed to speak the many languages of
chemical data. It's an open, collaborative project allowing anyone to search,
convert, analyze, or store data from molecular modeling, chemistry, solid-state
materials, biochemistry, or related areas.

http://openbabel.org/

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
imagemagick: option for rsvg support

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mysql 5.5.20
Add specialty formulase to inheritance check
xaw3d: fix audit warning
Open TTD 1.1.5

Note that Lion users will probably want to install --HEAD instead.
emacs: fix linking on X11

Borrow a fix from MacPorts to fix x11 support
fuse4x: Update to 0.9.0

Closes #10768.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
winexe 1.00

Closes #8166.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
The E Theorem Prover 1.4

"E is a theorem prover for full first-order logic with equality. It
accepts a problem specification, typically consisting of a number of
first-order clauses or formulas, and a conjecture, again either in
clausal or full first-order form. The system will then try to find a
formal proof for the conjecture, assuming the axioms."
[http://www4.informatik.tu-muenchen.de/~schulz/E/E.html]

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
zsync 0.6.2
Fixed some MIPS calculations to be compatible with reference processor
under AADL V1 and AADL V2
added code to handle aadl and aadl2 as extension. We had situations
where we did not handle aadl2, but at the same time had the parser set
up to accept this extension.
Merge remote-tracking branch 'osate/develop'
leave instance model resource and file in place even if there are errors
in the instanitation. Otherwise, we lose the error reporting capability.
We had attempted to remove them on error since they may contain
a garbled
model.
Commented out catch of exception in instanitateHandler
Merge remote-tracking branch 'osate/develop'
package.js update

Git repository added to the package.js file
18/9/2012 09:20
fix load balons
update version
fix mqo importer tessfaces
fix mqo import mesh.update
remove 16 material limitter from mqo import
remove 16 material limit from pmd import
pmx import is not split mesh by material
2.7.0
phone required again
Removed youtube controls from trailers, added next to sequencer public interface for future icantseethistraileranymoreshowmethenextone-feature
Merge branch 'master' of github.com:pa7/Online-Cinema
cambios en lights
Rework Array firstObject and lastObject notificatons.

Previously we were calling 'get' for both, but now we check the cache.
This means change notifications will always trigger if the values are
not cached but this case should be rare.

Fixes #802
Remove stray references to IndexSet
Fix and renenable disabled Array#replace test
Fixed a small error in the containerView documentation regarding 'removeFromParent()'
Fix RVM website URL.
Merge pull request #815 from MikeAndrzejewski/patch-1

Fix RVM website's URL in README.md
Merge pull request #814 from oskbor/patch-1

Fixed a small error in the containerView documentation
catch errors and file them in a separate mailbox
added bug reporting link
vim,ctags: added vhdl
Desafio Olimpiadas Rusas
Handle resolution relative to root context properly
We can handle a trailing slash in base-url, too
Merge pull request #60 from jcrossley3/replace

Resolve relative to root context better
Merge branch 'master' into tracking
Merge branches 'tracking' and 'master'
Finished Type
Finished category
Product page
Twitter serach
Added primitive product search
Progress
.
Grid and more stuff
Single designer
Single category
Serach
Finished styles
Clean up
Removed exhibition specific
removed htaccess and hardcoded redirect link
Added favicon support
Added manual manitence mode
Fixes
Image size on singletype
Error in press id
Implementação da gravação da @Pessoa
move delete functions to update model
cleaning up utility api
add some dependencies and such
add rspec
updated
Updated zenburn for some missing faces
Some preference tweaks
Removed nxhtml.
Geisery stuff
Added some external modules
Updated org-mode
Changes
Brought yasnippet up to date
Added doc-mode.el
Updated submodules.
Tweaked .gitmodules to come with shime moving.
Brought shime up to date
Updated yasnippet
Tweaked submodules
Some changes
YASnippet fiddling
Updated some submodules.
Updated submodules
added some snippets
Updated theme.xml
Updated setuputils to version 0.9.1, in development.
Commit inicial do exp. 8
Merge branch 'master' of http://github.com/pedroembrito/F229
tekstkilder
VERION 1.1
tabel med sigler
tabel med sigler
disclaimer 
disclaimer
disclaimer
disclaimer
disclaimer
disclaimer
disclaimer
disclaimer
disclaimer
disclaimer
disclaimer
tabel
tabel
tabel
tabel
tabel
Merge pull request #175 from blackberry-community/gh-pages

Nfc samples
Merge pull request #176 from blackberry-community/gh-pages

Added Qt and BPS-based BBM Samples from Cascades-Community-Samples
Update All_Samples.json

Added BBM, context menu, media/cards invocation, notifications, and PIM (contacts) samples.
Merge pull request #177 from oros/gh-pages

Pull request back to blackberry/Community repo.
adjusted a tag in sample catalog
kvm tools: Fix sdl hang

Commit b4a932d175c6aa975c456e9b05339aa069c961cb sets sdl's .start
ops to sdl__stop which makes the sdl never start.

Fix it up.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
kvm tools: Update README for CONFIG_FB_VESA

CONFIG_FB_VESA is needed for --sdl or --vnc. Update README for it.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
﻿[change]调整目录结构
Merge pull request #113 from jianling/dev

﻿[change]调整目录结构
[doc]Pager的event注释补充
Merge branch 'dev' of http://github.com/BaiduFE/Magic into dev
Merge pull request #114 from xiadengping/dev

Pager注释修改
[doc]ComboBox注释修改
[doc]ComboBox注释修改
Merge pull request #116 from xiadengping/dev

combobox注释修改
[doc] 注释默认值修改
Merge branch 'dev' of https://github.com/BaiduFE/Magic into dev

Conflicts:
	src/magic/Pager.js
	src/magic/control/ComboBox/$suggestion.js
Broke out router to separate file. Started implementing login.
Support for sign in/out.
Upload functionality added.
created cat facts pew
endre litt i Token, CharGenerator og Scanner
attempt to add remove to loaded markers
Fixed typos in modal
distro-3.4: bump to v3.4.5-pf
version-3.3: bump version to 3.3.3
distro-3.3: update PKGBUILD version to 3.3.3
Merge branch 'version-3.3' into pf-3.3
Merge branch 'distro-3.3' into pf-3.3
AS7-4283 File cache store location used by ROOT.war overlaps with location for other contexts
Append "ROOT" to cache name of used for root context.  Prepend "infinispan/" to default file store path.
+ bugfix garbage collector
Updated debug doclet to handle new way of parsing implemented interfaces
Live site initial commit
SEs for mirt and bfactor
Fleshed out console reporter
Updated .gitignore
Added approval test for aborted test results (-a)
console reporter is now a full replacement for the basic reporter, using the new streaming interface directly
Console reporter is now the default
phonegap 1.9.0rc1
removed more redundant code parsing prop.selector/prop
highlight the selected text by bold and header height is fixed
[artf591306] gear icon added for jquery mobile technology and clone success message issue fixed
artf544227: resolution settings in functional test for widget projects
R/A AAA017 AAA019
Make OAUTH 2.0. Add network package
rozpoczęcie prac nad nową wesją. zmienione mian menu
removed unused files and old scripts
Squashed 'bundle/vcl-vim-plugin/' changes from 8cbf8a0..f7b813e

f7b813e Add vcl indent file

git-subtree-dir: bundle/vcl-vim-plugin
git-subtree-split: f7b813e5f7dc03511c79d3f48d159062660c48c8
Update bundle/vcl-vim-plugin from github pkufranky/vcl-vim-plugin master

from https://github.com/pkufranky/vcl-vim-plugin

Install or update

	bash github-plugin-install.sh pkufranky/vcl-vim-plugin vcl-vim-plugin master

* commit 'ef64469fbfc9adc8302ad71e17d4ed14cb68c6a7':
  Squashed 'bundle/vcl-vim-plugin/' changes from 8cbf8a0..f7b813e
Call setCurrentView from updatePlaying

This simplifies the methods called to update child
views.
- use system expat
Merge branch 'master' into AC-branch
tried a literal
Add a mirror dvorak keyboard
Additions to brews.
Finish user edit, update, index, and destroy actions
final gems
modified:   views/404.php
	modified:   views/update.php
fixed args for spider jump wait
Cambios Varios
Cambios Varios
Cambios Varios
classes for testing
Raw working version. Accepting connections
via telnet and transmitting messages to users.
Hepp on this one
zetaciv implemented, and betaciv refactored, small changes to gameimpl
typos
fix tests (timezone aware dates)
views are now independent from each other

That means you can add different filters to different routes using
the same view. I accidentially assigned filters to the view name,
not the view instance.
Don't duplicate pgAgent object names on the DDL reports.
Add comments suggesting usage of git_changelog to generate release notes.
Fix inappropriate error messages for Hot Standby misconfiguration errors.

Give the correct name of the GUC parameter being complained of.
Also, emit a more suitable SQLSTATE (INVALID_PARAMETER_VALUE,
not the default INTERNAL_ERROR).

Gurjeet Singh, errcode adjustment by me
Fix WAL file replacement during cascading replication on Windows.

When the startup process restores a WAL file from the archive, it deletes
any old file with the same name and renames the new file in its place. On
Windows, however, when a file is deleted, it still lingers as long as a
process holds a file handle open on it. With cascading replication, a
walsender process can hold the old file open, so the rename() in the startup
process would fail. To fix that, rename the old file to a temporary name, to
make the original file name available for reuse, before deleting the old
file.
Fixed typo in README
Merge pull request #25 from shireeshj/master

Fixed typo in README
Works with a custom surface view
Works with a custom Drawable (low memory usage)
Cleanup
Links integration tests
Fix leak.
Add samples for 'interfaces' and 'routes'.
[Creatures] Add type and inventory initialization.
[BasicTypes] Initial commit.
[Merge] Merge branch 'master' into creatures
(Needed for BasicTypes.)
[Humanoid] NO, GOD, NO!
[Merge] Merge branch 'dev' of github.com:pr061012/pr061012 into dev.
Tranlsation fix
Increment version to 1.1
Quick bugfixes concerning SaveArticleTask and RemoveArticleTask
test de compilation
产品库显示，支持用户和标签
remuve duplicate README.md
minitest syntax
Debugger makes deploying to linux angry
修正屏幕中心位置
added start and stop time to plotting gui
Lat & lon can be empty
Removed cow handling from wyil_update* in lib.
Added gneral wycc_cow_obj with stubs for various cow_types.
Reworked writeCodeUpdate so it handles two layers of index.
Much will work in general, except the need for intermediate temporary variables.
Those temps can be found as negatives of the operand registers.
 pass 6 19 301 441
115
Styling Init
changed pubnub-3.3.tar.gz to pubnub-3.3-for-pip.tar.gz
Enhanced history and detailedistory test functionality except reverse
correct readme (again)
(#14764) Stub architecture fact when Windows facts run on Linux

Previously the Windows specific tests were failing when run on Linux
(but not Mac or Windows), because the processor fact always runs Linux,
Aix, and Solaris specific commands, causing the architecture fact to be
loaded, which loads the hardwaremodel, which was recently changed to use
WMI to retrieve the processor architecture instead of using RbConfig.

This commit just stubs the architecture fact until the processor fact
can be fixed to conditionally execute those commands based on the
current kernel fact.
Merge remote-tracking branch 'joshcooper/ticket/1.6.x/14674-stub-architecture' into 1.6.x

* joshcooper/ticket/1.6.x/14674-stub-architecture:
  (#14764) Stub architecture fact when Windows facts run on Linux
(#13535) Fix uptime; use `uptime` instead of `who -b`

Without this patch applied the uptime fact value is often wrong on some
flavors of Unix.  In particular, the value may be negative or simply
incorrect.

This is a problem because the Facter value does not contained the truth
of our reality.  This makes it difficult to model reality inside of
Puppet.

This patch fixes the problem by replacing the unreliable who -b method
and the Solaris kstat method with a simple call to the
"uptime" command.

This patch also adds RSpec tests for new method and remove RSpec tests
for removed methods.  Delete now-unused fixture file who_b_boottime.

Reviewed-by: Jeff McCune <jeff@puppetlabs.com>
Merge branch 'ticket/1.6.x/13535_facter_uptime_can_be_wrong_on_AIX' into 1.6.x

* ticket/1.6.x/13535_facter_uptime_can_be_wrong_on_AIX:
  (#13535) Fix uptime; use `uptime` instead of `who -b`
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#13535) Fix uptime; use `uptime` instead of `who -b`
Cleaned up temp files
Made temp file guard more aggressive in gitignore file
Resolved compile warnings
Added auto-test jig
Added gitignore for tools folder
Merge branch 'master' of github.com:px4/px4_nxbuilder
Put I2C reset into place
first commint
upload the first python file
Merge branch 'master' of https://github.com/py1sl/MC-material
ELV MAX read support