labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' into pinyin
So the original plan was to split "select character from word" in this separate branch, but it'll be easy to get conflict if I don't merge master first now.....
move spell hint of pinyin-enhance into a separate file
check disable spell in main part
Merge branch 'master' into pinyin
zh_CN translation
Merge branch 'master' of https://github.com/fcitx/fcitx
Disable replaceing the first candidate word by default. Afaik, it's a little confusing sometimes when I want to type words that are not in the dictionary, and is useless when I want to type Chinese.
use raw buffer to replace preedit instead
Merge branch 'master' of https://github.com/fcitx/fcitx into pinyin
rawmemchr, initialize address, ret = 1 by default, no flush dbus connection after having got a reply
Merge branch 'master' into pinyin
Merge branch 'upstream' into pinyin
safer get address (if it is going to be in dbus-utils)
a cleaner way to get process name under linux (borrowed from hotot). tested with ctypes.
use switch-case for PadToMain (gcc will take care of the look up table in this way, and it dosen't need an extra compare function)
add pre-filter and post-filter for pinyin-enhance (empty now....)
even simpler
Reduce function calls in MessageToCString
Select character in the first candidate according to cfp_string
Move CFPString to pre-filter since these keys will very likely be handled by input method (and commit the current string) (anyway, if the user REALLY chooses a cfp_string that is conflict with some builtin keys of the im-engine, there isn't much I can help with.... = =...)
Bind Config for pinyin-enhance cfp options
GetSelected, not perfect but should be fine...
Select the candidate word to use for cfp
Clear the selection on page change and candidate list update
typo.....
check_im_type in prefilter and postfilter
try not to confuse user by doing cfp on english words
remove cfp from pinyin
v6.0
Merge branch 'master' of https://github.com/yybirdcf/ecust.git

Conflicts:
	OSProject/disk
added q c file
Add initial index page with example question
Add initial styling
Add coffee-mode
Add some trivial features
Update some settings
Setup the association between the User and samples
Launch needs bundle version change
bug depenciInjection wsse
Added DBUS_SESSION_BUS_ADDRESS
Updated
Added musioplayer
Updated the readme.. who is anyways completely outdated... stuff to do...
keymap select setting
Project update
Use weak properties (Framework needs iOS 5, so weak pointer are also available) instead of assign.
dongqs
Added Flattr button.
Read stdin when no file is specified
Merge pull request #22 from tkf/read-stdin

Read stdin when no file is specified.
Updated documentation, Sundown and minitest.

 - Added a new page to the documentation about development.
 - Updated changelogs and THANKS file.
 - Bumped version numbers.
 - Updated Sundown.
 - Updated minitest.
Revert base_url.
Change failing test.
Updated Sundown files.
Update description of update_vendor command.
SmartyPants is now a preprocessor instead of a postprocessor.
Updated documentation.
Revert change to SmartyPants.
Minor addition to development manual.
Update extension flag in script/misaka.
Added and test and updated an extension flag.
Merge branch 'master' into debian
Remove bogus lines in Rakefile
New snapshot
deleted:    @
	modified:   Browser.xcodeproj/project.pbxproj
	renamed:    Default-568h@2x.png -> Browser/Default-568h@2x.png
	modified:   README.md
Search realigned
change to list
need to debug border
Colorwheel starter for ten…
No return for picture captions.
Rename activity_invitations.xml to invitation_row.xml
Add a line for when there are no invitations.
hemos añadido un hola mundo
pass opts to HCLI
Removed various notices under strict mode.
Strict fixes.
Merge branch 'master' of github.com:kaspernj/knjphpfw
Upload error handeling.
Merge branch 'master' of https://github.com/kaspernj/knjphpfw
Merge branch 'master' of git://github.com/kaspernj/knjphpfw

Conflicts:
	functions_knj_filesystem.php
	http.php
	inc_error_reporter.php
	knjobjects/class_knjobjects.php
Clean up.
Merge branch 'master' of github.com:AJenbo/knjphpfw
One check is fine
Fix sql helper
removed mitch_test file
ダウンロード機能実装
Joinを追加中。
Applyを追加
join.jsを分離するなど。
f
f
d
Merge branch 'master' of github.com:AdamSSS/testmnb
f
Merge branch 'master' of github.com:AdamSSS/testmnb
g
G
F
Merge branch 'e' of github.com:AdamSSS/testmnb into e
F
xml and YAML
Just now noticed the presence of factorial in standard library... So removed my factorial with its tests from the library. The standard library will never stop surprising me
background image
add title and background image
version bump
Added support for mono. Tested on debian squeeze with mono 3.0.2 (openssl 0.9.8 required)
Added BindIP and BindPort config options.
changeset for OIPA API v2.0 implementation
changeset for OIPA API v2.0 implementation
changeset for OIPA API v2.0 implementation
test code for profs
[ADD] Method to update and save together in one request,
Version bump to 0.0.4
Regenerate gemspec for version 0.0.4
undone the static file derp
Bugfix: root must stay the same during the recursive process.
Completely revamped the plugin. Now using mutliple packages and classes to make code look cleaner and to enable a few features that we were having issues with.
Added time to tests :)
Paper skin update
Chat shows # of unread messages in favicon
Added Error handling to bml2fcs
Fix Issue 886: Appearance should now update after taking ryetalyn.

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@4723 316c924e-a436-60f5-8080-3fe189b3f50e
Merge branch 'cib' of github.com:CIB/tgstation13 into cib

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@4724 316c924e-a436-60f5-8080-3fe189b3f50e
Nodrak's away mission map!
It's a small research station that has been rammed by a syndicate shuttle.
Note that power slowly drains from the map, the SMES does not appear to be outputting any power. Any additional code is contained in stationCollision.dm

I've removed the line about z-level transitions from fileList.txt as those got removed from awaymission zlevels.

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@4725 316c924e-a436-60f5-8080-3fe189b3f50e
Unticked the away mission map files in the previous commit.

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@4726 316c924e-a436-60f5-8080-3fe189b3f50e
Clown and carp are faster now so they can actually catch their targets.

Camera lists don't include mobs on away missions.

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@4727 316c924e-a436-60f5-8080-3fe189b3f50e
fix dangling `buffer` in IPython.parallel.util

Prevented numpy arrays from being passed as arguments to view.apply.

Previously failing test included.
enable non-copying sends in push

zero-copy of numpy arrays only applies to first-level in args/kwargs, but push took a dict as arg.  This simply changes push to pass the same ns as kwargs, so numpy arrays will be discovered.
test that pushing numpy arrays is zero-copy
Fix double indentation in _PrettyPrinterBase.group().

_PrettyPrinterBase.group() was increasing the indentation twice
(once in the call to begin_group() and once in the call to indent()).
Fixed by removing the call to indent().
Add test for the indentation fix.
BUG: Include the name of the exception type in its pretty format.

Thanks to @doerwalter for noticing this.
Merge pull request #1477 from minrk/py3numpy

fix dangling `buffer` in IPython.parallel.util, which should be memoryview on py3

Previously failing test included.

closes #1401
Merge pull request #1489 from minrk/ncpush

Fix zero-copy push

zero-copy of numpy arrays only applies to first-level in args/kwargs, but push took a dict as arg. This simply changes push to pass the same ns as kwargs, so numpy arrays will be properly recognized by the serialization machinery.
Fix for pretty-printing builtin exceptions in Python 3.
Merge branch 'fix-exception-pprint'
Merge pull request #1517 from doerwalter/master

Fix indentation bug in IPython/lib/pretty.py
implement the completer in a separate class

more feature like
-completion based on 2 sources :
    * introspection in kernel
    * context of current cell (complete with matching words)
    * each source has its color in the completer
use strict and clean a little.

    adding 'use strict' in some place to be more agressive on the
    delaration of the variables.

    clean name and details here and there
fix and retab javascript
comment more
fix replace range bug

    pylab.l<tab><tab> would be replace by .l because of a bug in common
    start finding .l on the fifth position of pylab.start.
add a keycodes structure to utils

    this structure (IPython.utils.keycodes)
    add some common keycodes like tab...etc

    and start modifying codecell.js to use it for better readability
import Utils keycodes into the completer
Removing some code that seem not to be usefull anymore

    if having problem with Tab Completion try to revese this commit
add ctrlKey.which to utils

and modifies some file to use it
[Update] TTTAttributedLabel (1.3.0)
added JDDroppableView podspec
updated podspec for JDDroppableView
added JDFlipNumberView podspec
Merge pull request #379 from jaydee3/master

Added JDDroppableView & JDFlipNumberView podspec
fix CTidy spec validation error
Add version 1.0.1 of Yandex Map Kit spec
removed warnings in MemoryPlayerDAO
removed warnings in PlayerDAO
implemented DeckDAO into Theme
removed unnecessary rails index and image
added pages controller and updated routes
Fix formatting for GitHub: The Surrender

As far as I can tell, github doesn't support block code in AsciiDoc
READMEs, so I give up.
Fixed complete command to update
gpu particles first working version
added public import of notify constants
intermediate version. contain bugs in network channels. name service
added
Merge branch 'master' of https://github.com/Dazo-org/zerovm.git
UXaudio - MP3. Loading and initing...
Build against Java v1.7.
Update Bukkit version dependency.
Update bPermissions version dependency.
Update bPermissions listener for bPermissions v2.
Prevent deny text from being displayed on items that can't be protected.
Add protection of beds.
list of files updated for 20120808 at Aug 9, 2012 11:25:04 AM
lotoplus json update at May 27, 2012 8:30:37 PM
Changed the footprint of the AAP and MAP sensors to 8-SOP, changed to USB-B Micro connector, added proper zone cutout below CPU and rerouted board.
Updated PDF files after the schematic and PCB changes.
final

- PB with the photos
Working accept/deny certificates in the administrator panel
Added more stuff to gitignore
Merge branch 'master' of github.com:DomoTop/DomoTop

Conflicts:
	Product/Controller/build/classes/org/openremote/controller/Constants.class
	Product/Controller/build/classes/org/openremote/controller/action/ConfigManageController.class
	Product/Controller/output/controller.war
Changed Pro File for Linux

Had to rearrange the order of the unix LIBS in the .pro file in order
to build correctly.
Enable cooldowns and shizzle for aurawatch

Add Monk auras - thanks for Shen
Document the --force option for the 'merge' command, and implement it .
ADDED
+warnings weghalen
Added Octree.h
fixed issue with the labeling
updated MFFetch function to remove dashes and multiunderscores from matrix names with gsub
Prepared website template from design, only need to fix navigation right and searchbar-options 2
first commit
Added forwarding URL to readme.
Merge branch 'master' of https://github.com/micmath/jsdoc
dependency checking should be done independently of the load load method
Added FindCraftBySpellIds
Partial pdo upgrade from mysql connections
Collections documentation.
initial commit for stublog
changed layout files, added header and footer, added first empty static pages, removed index.html
Merge branch 'master' of github.com:GKnirps/stublog
I have added some lovely ascii art from online.
I reverted
Merge branch 'master' of github.com:GOFIRST/scratch I added a Dragon.

Conflicts:
	README.md
Boomboxed
changed sandbox to sand castle
Merge branch 'conflict'

Conflicts:
	README.md
Merge branch 'master' of github.com:GOFIRST/scratch

Conflicts:
	README.md
Merge branch 'master' of github.com:GOFIRST/scratch
commit 5

Collision Physics Working And User Gets Absorbed On Contact With Enemy!!
Thanks to processing forum user "asimes".

http://forum.processing.org/topic/trying-to-do-circle-on-circle-collision-detection-but-i-can-t-make-it-work-where-is-the-bug
Template fix + arrows for paging buttons
Added MimeTypes as "constants".
2012-05-27 => 0.1.10
- fixed possible failure if put device info is not supported.
- set delete event not to purge db to prevent alarms from sticking.
- cleaned up MimeTypes in device info (thanks to Matthias)
ACTION value großgeschrieben, TRIGGER ohne Parameter muss DURATION
sein. Auch =\n als Leerzeilen entfernen, ist die 1.0 Version. Immer
quoted-printable unquoten, wenn 1.0.
parsing does not crash anymore if empty last-anchor field is
transmitted.
also resets synclocks on fatal error from libraries.
Will prefer preferred Mimetype from server announced types. 
removed "FUTURE CAME BACK"-logentry in receive msg.
will not do "SLOW" sync if server requests refresh, when we are doing
a refresh from server. 
added message to app, that it is connected to a running sync.
will now call create also for accounts that are already in DB but
don't have account ID. Modify only for really existing accounts.
2012-05-28 => 0.1.11
- fixed reset service
- added some hacks to support Syncfriend.com
- added some fixes to support alarm parsing from OCS server.
ncmpcpp with visualize/fftw support
Switched setup.py to use the PEP 386 compatible version string
Finalisation du Parseur (avec les fichiers c'est mieux)
Recreated project for JS as its needed as an organizational unit and switch sctructure of json object for metdata to have version in the root
Fix includes in gnc-date-edit.c

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22629 57a11ea4-9604-0410-9ed3-97b8803252fd
Remove empty lines from AC_CONFIG_FILES

The Windows build from git trips over these

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@22333 57a11ea4-9604-0410-9ed3-97b8803252fd
Quad is stable.
Adding output() method
BedOverlaps was debbuged: by adding std::unique in front of set the duplicate bases got filtered!
BedOverlaps.cpp changed: it is meand to work on npf now for bed files must be checked,only stdout
app-i18n/fcitx-cloudpinyin: upgrade to 0.2.1
app-i18n/fcitx-sunpinyin: fix EAPI
2nd status
uncuried messages works properly

(need to fix the curies)
Added plugin
Merge branch 'master' of github-iber:Iber/chartbuddy
ICE as a submodule
Merge branch 'develop' of github.com:Indiefreaks/ice into develop
Merge branch 'develop' of github.com:Indiefreaks/ice into develop
Updated ICE so ILMerge is retrieved relatively to the project
Left nav and JS for it..
Add player create Action and Spell entity.
disabled fixed positioning of bg image
palying with block display
fixed backen
ui <js> 编译到模板的预处理部分
Update import/derelict/sfml2/graphics.d

Added sfMouse_getPositionRenderWindow and sfMouse_setPositionRenderWindow functions.
Ajout de la stop list.
Merge branch 'master' of github.com:Jokahero/elgooG
Archivo Leeme.txt agregado
add octal literals (e.g., 0o755)
construct Dict from other iterables. part of #1450
also, better not to steal identifier "dict"
Dict documentation updates.
Add map and map_to methods for Ranges
added pic to picture branch
Update README.md

Change text styles
Update README.md

Change text style
Fix all covers link.
Updated lexer
Added a parser to parse layout in glsl
some kind of useless modifications
Added gui profile
Merge branch 'master' of http://github.com/Karatekiwi/sbcm
system groups - adding add/remove systems, lock/unlock and controller tests for api
typo
typo
Proxy hack [Doctrine]
Remove unused imports in "scriptEditor" component.
début algo décision + correction data : en attente pour les états
compilation windows
fix build with recent intltool

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
GameInputs: Complete
GameThread: started, needs Thread-properties
DisplayHandler: Complete for starting Display
P'tit bug sur la visualisation des anciennes citations
Addition of git/show/head
The setting of ediff-current-diff-B must be done after ediff is loaded
Make the diff-changed face look nicer
Start the log reports for today and yesterday with the clockreport
Addition of my default abbrev and put the abbrev file in the perso directory
Get rid of the jabber.el package because I don't use it anymore
Check the NOTMUCH_CONFIG env variable before fallbacking to the ~/.notmuch-config file
Change the address of the w3m submodule to get an up to date version
Use latest version of w3m
Addition of bbdb
In konix/indirect-region, allow the forcing of the indirect mode with the prefix argument
Split konix/yank-current-buffer-name into konix/yank-current-buffer-name and konix/yank-current-buffer-file-name
Add a binding to call gnus-alias-determine-identity in the message mode
Addition of a way to see erc buffers into bs
Add a custo of elpa user dir
Put stuff where they should be
Take newest version of dictionary
Remove diff mode
Rename snippets to follow the normal coding style
Add a way to add font lock on quotes
Adding model Datab.
AdminAssignment Fixed to new model
Merge branch 'master' of github.com:Kritzkrieg/PKSU
Assignment
  Fixed a bug caused by a missing check
  for if Read() was called

Assignment/Index
  Fixed the remaining radio buttons
  so the text associated with each
  radio button can be clicked
2 lines left
Merge pull request #191 from akumax/patch-2

2 lines left
Update master
Merge pull request #7 from damieng002/patch-5

Update master
Message about English names
Merge pull request #184 from Wolfy76700/patch-5

Message about English names
Update Master
Merge pull request #177 from Arente/patch-126

Update Master
Bug fix on line 9, extra control code.
Finished everything but the last line, I believe it is something along the lines of:

"The ball can't be used because of Ghetsis' Energy! !"
Merge pull request #10 from vinnymac/patch-1

Finished everything but the last line, it might be:
a line
Merge pull request #726 from bounky37/patch-29

a line
Translated the line containing the date.
Merge pull request #320 from PikalaxALT/patch-45

Translated the line containing the date.
Update master
Merge pull request #222 from mafiox/patch-107

First line a bit 2/0386
Update master
Merge pull request #144 from mafiox/patch-29

Full Translated 2/0041
Tweaked download link according to available space on mobile.
Replaced filler text with a real paragraph.
Added gitignore, updated dependencies

Require zxing in pom.xml (for reading QR codes).
Also changed email address in CakeCam.java for testing
Moved accepted QR codes to external file for easy editing

Also changed file path for testing on windows. (This will be reverted)
Pychoked and good to go. FPS updated, this time is displayed pyglet style ;)
strong-stone-9860.herokuapp.com
instructions for using Debian Squeeze with Lophilo
some reflexion and notes on current status of Lophilo QEMU
first Linux boot to installing node.js
ReturnType changed from QString to int in esrChecksum to be more logical
Implemented the Smtp-Functionality temporarly
added correct bp length
Merge pull request #78 from teharrison/develop

overview page: added correct bp length
updated to support multiple 'misc_param' fields and to dump all non-template metadata tags into 'misc_param': misc_param_1, misc_param_2, etc.
Merge pull request #28 from teharrison/master

added more fields to metadata export
Remove eclipse project file from path
update ignore file
add under fle
fixed problem with madrid
start of mus.peg
brisanj pomocu git rm --cached <ime datoteke>
Began FullWindow Page
The next step for FullWindow Page
Added hko.gov.hk.png
removed another reference to /home/michael/local
Validación VentanaDiurna
Add base for all future Mhykol Mines commands.
bugid-51178 fixing messed up editor when anon editing is blocked

moving p2 fix to release branch by cherry-picking as the bug fix branch was off of dev instead of the release branch.
cachebuster for preview
Merge branch 'release-133-cachebuster' into release-133
BugId:51448 - Add ads to namespace PlayQuiz (1020)
Merge branch 'bug-51448-add-ads-to-quiz-namespace-release' into release-133
bugId:20141; changed the way of catching an addition of a video to a wiki; introduced new hook
added one more parameter in new hook
bugid-51441 fixing alignment of global notification messages inside modals
Merge branch 'bugid-51441' into release-133
IGN Ingestion: Change FEED_URL to new version provided by IGN, only affects ingestion
Merge branch 'release-133' of https://github.com/Wikia/app into release-133
killing php notice in RC
manually merged bugid20141
Fix PHP Fatal error:  Access level to ApiGeocode::getExamples() must be public (as in class ApiBase)
Fix PHP Fatal errors in API modules:  Access level to getExamples() must be public
Merge api-getexamples-method
remove a typo in class name, added tracking for main page
Merge branch 'bugid-51284' into dev
Fixing PHP Fatal error:  Call to a member function recordOption()
Removing hint to use Primary Key after schema change (BugID: 50893)
utils: add static Base64::Encode and Base64::Decode methods
utils: add CHttpResponse to create custom HTTP responses
network: add websocket implementation

Implementation after draft-ietf-hybi-thewebsocketprotocol-10 (http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10). The usage of wss (secure websocket using TLS (Transport Layer Security)) is not yet supported.
websocket: add support for version 13 by implementing RFC 6455
network: extend CTCPServer to support WebSocket sessions
CHG: CEC: Assign the "Setup menu" button to "Title", i.e. context menu
[pvr] channel group selection without channel switch, do not change
overall playing group
Fixes no focus on Find similar programme

When Find similar programme button in Context menu on Guide view is clicked, Search list opens with search results, but there is no focus on search result list.
If you are using XBMC without the mouse there is no way you can browse search results.

This small change fixes that.
[pvr] Use correct title for recordings (if available)

Currently it seems to use the title from teletext (on dvdplayer)
[PVR] Changes to make PVR Groupmanager able to deal with groups again
Merge pull request #1456 from fetzerch/bugfix-pvr-recordingtitle

[pvr] Use correct title for recordings (if available)
Merge pull request #1463 from avdleeuw/ticket13347

[PVR] Changes to make PVR Groupmanager able to deal with groups again
Merge pull request #1424 from BluTuTh/patch-4

[PVR] Fixes no focus on Find similar programme
Merge pull request #1306 from koying/cecsetup

[cec] Assign the "Setup menu" button to "Title", i.e. context menu
Merge pull request #1477 from xhaggi/pvr

[pvr] improved channel group selection within channel osd
[pvr] fixed - select the correct item in the list when switching between groups in CGUIDialogPVRChannelsOSD
[pvr] fixed - epg tables weren't created for some channels when the initial import was stopped before it finished
[epg] removed old debug relic - no crit section in the epg db
[pvr] - on UpdateAddons check if addon is already in db - if not - add it (which will automagically disable it) - this fixes autoenable of all found pvr clients on first startup
Merge pull request #1478 from Memphiz/addpvraddonstodb

Fix PVR addons get enabled alltogether when found the first time
[darwin/deps] - enable build of pvr addons for ios aswell
GUIEPGGridContainer - fix ruler for non UTC timezones
GUIEPGGridContainer - always use setter for m_blockCursor to prevent focus going out of screen
[pvr/epg] less spammy logging
Merge pull request #1496 from mikrohard/guiepggrid-improvements

Guiepggrid improvements
Added qunit as a dependancy.
Added contents to the readme.
Setup some trivial unit tests, and got the testing framework working with `npm test`
Changed readme.txt to readme.md.
isThreatened == functional. fuck yeah.
DWB crashed about 10 times during work, can't really be used for production.
update 3d graphics checksums for labels-as-rectangles change
get benches.scala working again on master (classpath fix)
very minor user manual tweaking
making bar chart working with empty groups
[#90] improve bar/stackable chart's handling of empty groups
spiked line chart implementation
spiked transition on line chart
added test case for line chart path drawing
improved dynamic y axis range calculation
added default impl of x/y value getter
moved x/y value getter to the base chart
fixed broken unit tests caused by refactory
v0.3.0 release
polish and added some more advanced unit tests
Replaced Timer by Scheduler in Poller.
Update for Rx 2.0
Rx 2.0.1
First Poller test.
Corrected Tests namespace.
@新的垃圾回收算法（20％）
在codger v3.1中采用分代式节点复制垃圾回收算法
版本3.0及以前采用的引用计数来回收垃圾，但是引用计数不能正确回收环形引用。
所以在3.1放弃引用计数，而采用分代式节点复制算法。
为了适应新的算法，整个构架都必须改变，基本上要重定大部份的代码
Fix and improve task list display, add warning when no internet connection
switch from common::concatfilepart to concat[1]

[1] https://github.com/camptocamp/puppet-concat
merge
update: enesim pulgin to use revisions
add: better logs && shows status of build
Use `typ` module instead of ad-hoc type predicates.

Also remove a now-superfluous check.
Adding changelog entries for the applied fixes
capped off Map 1 start area
realization Class SAddr
Issue 37 Details Tab Styling
Fixed conflict
Implement settings for Own Ship size in the Options window
Turn Chart Groups popup into an Options window tab.
不要validate_uniqueness_of :title(new.rb) 爬虫的归属 #221 #219
修改了百科正文页
从新闻创建页拷贝了一份作为百科修改页（待修改）
给新闻、百科正文添加了添加标签的功能 #138 ，完成了修改wiki的页面 #140
代理人看到的百科正文页，包含了版本控制 #104
Tidied
Tidied
Fixed tests
Ignore MYMETA.*
Break sfml's files into multiples files (one ~~ by files)
Convert functions moved to convert.cpp && std::vector<sf::sprite> convert to std::map (remove the use of a function if you want to get a sprite)
add my personal (yet unfinished) backup script
add a scala update script which still needs to be upgraded greatly
initialization for git which need to go into a settings file
NEW SHIT AFTER ERROR 3014
MIT License
Merge remote branch 'foundation/master'
Added validations for email etc
included gyro
Fixed task performing, but still no task assignment.
Show new apps too.
Add UIKit resources
Implement UISlider
New Crashed Chopper code.
Dogs have been readded.
New test systems for loot and zeds.
Updated Basic SQL procs
updated recipe module url
Update UT bootstrap following Composer BC Break
Fixed deal to actually remove the card from the deck
blah
1.8 compatibility fix
rotation/turning working
Fix typo in a comment for RGB(A) png
Fixed error with mp3 format being incorrectly identified as an unsupported file type
Добавил 3 набора анимаций
Sytske niet zo spammen..

Spamsletje
equalized disclaimer top and bottom margins
refactored routine for user changing his password

- testcases
- error messages in dialog if old password or password confirmation incorrect
- fixed that other users can change each others passwords
login() in test cases now uses user fixture data directly
fixed typo lastControlelr -> lastController
bumped version string
[fix] #47 No drop shadow on video embedding popup
Add Travis CI status icon
Merge pull request #8 from rhattersley/travis-icon

Add Travis CI status icon
Added draft of a scanner plugin. Added map to features.
One possible fix, explained in email
增加打砖块工程，能初始化并使用D3D

Signed-off-by: yuanfan <yuan_fan1989@163.com>
Merge branch 'master' of github.com:ShanHai/ShanHai

Conflicts:
	YuanFan_Codes/Win32Window/Win32Window.sln
增加打砖块工程

Signed-off-by: yuanfan <yuan_fan1989@163.com>
Merge branch 'master' of github.com:ShanHai/ShanHai
alter

Signed-off-by: yuanfan <yuan_fan1989@163.com>
Merge branch 'master' of github.com:ShanHai/ShanHai
Add resource

Signed-off-by: yuanfan <yuan_fan1989@163.com>
Remove useless files.
* Add coding standards document.

Signed-off-by: Chglove <chglove@live.cn>
Оптимизация отправки армий
Merge remote-tracking branch 'origin/master' into Shikaka

Conflicts:
	Sources/AutoBOT.dof
	Sources/AutoBOT.res
	Sources/Unit1.pas
Проблемы рынка
Реколбаснул удалялку отчетов в связи с реалиями Т4
магия рынка + исправления в получении новых деревень
Добавил обновление уровня ферм.
Переработана постройка, теперь она сама определяет можно ли строиться или нет не заходя в здание
Доработки автостройки по данным БД, а не страниц
- Fixed auto_cd.
Support path resolution.
Increase the min threads in the threadpool.
starting to split JS client into its own project
Building jquery.signalR.js from source files:
 - Runs JSHint on each source JS file and fails build if errors found
 - Combines all source JS files into jquery.signalR.js
 - Minifies jquery.signalR.js to jquery.signalR.min.js
 - Sample projects updated to depend on SignalR.Clients.JS project
Updated Build.proj to use new JS client project.
Fixed copying of scripts to OWIN samples project.
Added hub events support to JavaScript client:
- API mimics the .NET client hub API (createProxy, on, invoke, etc.)
- Update MouseMove sample to use hub events
Minor JS changes to MouseTracking.js
Made some modifications to hubify.exe.
- Don't print the output of the copy operation.
- Run hubify from the bin folder of the sample app.
Merge branch 'master' into new-bus
Renamed example pickles script
add snmping_monitor
update paths to work with global binary
fate: do not test timecode with ISMV.
movenc/WIP: add timecode track support.

FIXME: something wrong with the duration?
pfadsfsad pfadsfas
Change button color
Merge branch 'master' of github.com:Socketubs/Pubik
Work on IDBlock.
Merge remote-tracking branch 'origin/master'
Using BlockFace.DOWN now for acid rain. Fixes Storm #5
Implemented ErrorLogger hack. Errors are now displayed better and stored to file.
Implemented ErrorLogger hack. Errors are now displayed better and stored to file.
Update references to data fields that were renamed
Random commit.

Signed-off-by: Johannes Lindhart Borresen <johannes@the.homestead.dk>
Merge branch 'master' of github.com:Tellus/sw406f12
removed head message from tex file
Corrected sourceforge filenames.
Check for GHOST response; log proper desired name.
Communicator registration does not indicate (directly) whether
identification was accepted.
Add tests
proj push - 1.2
Add .gitignore.
Almost fixed oauth event
Finished oauth events but bugs remain
Example edited
moved printouts to stderr
maven distribution repositories
adding protocol to studies
setting domain /range to the hasProtocol property
Adding  users as owners of investigations and studies
Adding affiliations
Example updated
Using the folder name as the URI suffix
Updated Git editor.
Change Maze README name and contents.
Attempts to fix a problem with the Courses auto field.
deleted comments from jsonrpc.py
phenotype fixe
reading playlist from text file
basic documentation
Hid the fieldset for twitter post
DB/Spells: Fixed Soulburn aura remove when you use the improved spell

Thanks to Darkrabbit for the help :D
disable comment tag for form auth
Merge remote-tracking branch 'origin/0.0.0.1' into 0.0.0.1

Conflicts:
	.idea/workspace.xml
disable comment tag for form auth
Merge remote-tracking branch 'origin/0.0.0.1' into 0.0.0.1

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/0.0.0.1' into 0.0.0.1

Conflicts:
	.idea/workspace.xml
Fix bad store name
Fixed Click error on Parent Element
Output Page: Rotation and shaders are only supported with 3D surfaces
fix compilation broken in b38aefc-8dab9e5
Fix "Snap to desktop edges" option for multi-monitor setup.

Snapping wasn't working correct on monitors other than the primary display.

This commit fixes ticket #2599.
Update German translation.
Update French translation.
fix German translation
fix a few cppcheck warnings:
* initialize var in the constructor
* reduce variable scope
* unused variable value
fix more cppcheck warnings
ADD: Drag & Drop Upload
Add ClockWidget and add preferences for text.
jslint меня запутал
Changed from JUnit to JUnit4
Added some things in the adapter test and commented it out so it won't
flood the server with useless posts
minor refactoring
Merge branch 'master' of git@github.com:Z-app/zmoteTest.git
task.cpp and task.hpp compiles
RPC output gets explicitly muted
restore deep_clone calls for the pages -- need to find a better way to do this
removed wildcard from RUBYLIB and added platform specific paths (will clean it up later)
squish.sh: Add runtime check for struct
RenderToTexture scene now uses a Renderbuffer as a depth-stencil surface
1.8.10RC4
fix input/change event in ios5
allow custom datalist ui
document new datalist option
fixed recent_cpu update
Update actorbuilder.h
add alias to suspend from console
popover now work after adding a new lookup key.
remove unnecessary logging
#63 fix highlight other instances of selected symbol when line numbers are visible

closes #63
rake task added, pending: rspec
Added new YouTube video
Added rugk command (invokes gitk on the manifest)
READMME.md add missing.
Simplify Core Data stack setup.
Rm extra files & code. @refactor
Removed useless div.
topology problems with mod_wsgi in apache
removing pp from topology updating and initialization
forgot to comment out all pp references
changing time dim name in topology to try and solve seg fault problem
added lots of syncs
decided that the segfaults are from improper architecture of python modules and dep libs
full setup from admin interface, added sites back in to tie into the wms test page
adding localhost and defualt user configured database to git index
changes for jbellis review:

* make TokenMetadata() pass arguments to TokenMetadata(BiMap, Topology) instead of null, null
* javadoc for Topology
* remove explicit type specification on create methods (except where required)
Merge commit '7591d55e348c3a3c164f6352baa01aa4071a4f86' into p/3881/00_snitch_topology
Merge branch 'p/3881/00_snitch_topology' into refs/top-bases/p/3881/01_calc_natural_endpoints
Merge remote branch 'refs/remotes/origin/p/3881/01_calc_natural_endpoints' into HEAD
changes for jbellis review:

* remove redundant @Override
* newline before else
* remove redundant isEmpty check
* s/replicaEndpoints/dcReplicas/g
* check termination condition explicitly instead of mutating replicaEndpoints (now dcReplicas)
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
merge
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge remote branch 'refs/remotes/origin/p/4122/01_bootstrap_decommission' into HEAD
Fix CQL3 index dropping

patch by slebresne; reviewed by jbellis for CASSANDRA-4192
explicitly set known command list size
Merge branch 'cassandra-1.1' into trunk
rename size -> dataSize
make dataSize TypeSizes-independent, and remove 25% fudge factor in liveRatio usage
patch by jbellis; reviewed by Vijay for CASSANDRA-4215
Fix typo, unreserved keywords should be case insensitive
Don't return range ghosts in CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-3982
fix the problem re-creating Keyspace/ColumnFamily
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4219
merge from 1.1
Merge commit 'refs/top-bases/p/3881/00_snitch_topology' into p/3881/00_snitch_topology
Merge commit 'refs/top-bases/p/3881/01_calc_natural_endpoints' into p/3881/01_calc_natural_endpoints
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Introduce MessageOut class, which wraps an object to be sent in the "payload" field.  The old Header class is inlined into the "parameters" map.
patch by jbellis; reviewed by yukim for CASSANDRA-3617
Automated refactor: rename Message to MessageIn
Automated refactor: move StorageService.Verb into MessagingService
Rewrite IncomingTcpConnection to deserialize w/o extra copies to byte[]. MessageIn now has a payload field, and uses the Verb to look up the correct deserializer. REQUEST_RESPONSE deserializer is not uniquely determined by Verb, so we look those up by their callback instead.

patch by jbellis and yukim for CASSANDRA-3617
Automated refactor: rename Message out of class names that aren't MessageIn, MessageOut, or related
serializedSize implementations, part 1 (gossip and streaming packages)
patch by jbellis; reviewed by yukim for CASSANDRA-3617
add serializedSize (part 2) and fix unit tests
patch by yukim; reviewed by jbellis for CASSANDRA-3617
cleanup CallbackInfo and mark deprecated Verbs
New TopGit branch: p/3881/01_calc_natural_endpoints
serialier() -> serializer and some clean up
remove unnecessary class
import patch
rename DBTypeSizes -> TypeSizes
New TopGit dependency: p/3881/01_calc_natural_endpoints
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Remove TopGit dependency: trunk
Merge commit 'refs/top-bases/p/3881/01_calc_natural_endpoints' into p/3881/01_calc_natural_endpoints
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
use hostId in handleStateRemoving
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4123/01_replication_strategy
Merge commit 'refs/top-bases/p/4123/01_replication_strategy' into p/4123/01_replication_strategy
Trying to work on lab5
CCamera rewrite

Rewritten old code; doesn't compile yet because changes in other
modules are needed.
test_classes
- Add deploytemplates target to copy .tpl files for views
Slight changes to badge registration
Fix badge registration age
Panel fixes, extra copy, required fields
Merge branch master
Better factoring out bootstrap changes
Add Go wrapper and client programs
Made get_indexes() consistent across backends.

Fixed #15933, #18082 -- the get_indexes() method introspection was
done inconsitently depending on the backend. For example SQLite
included all the columns in the table in the returned dictionary,
while MySQL introspected also multicolumn indexes.

All backends return now consistenly only single-column indexes.

Thanks to andi for the MySQL report, and ikelly for comments on
Oracle's get_indexes() changes.
docs: It's rsync_project not rysnc_project
Merge pull request #25 from akaariai/ticket_15933_alt

Made get_indexes() consistent across backends.
Simplified date-based generic views.

Removed a confusing helper function that was confusing -- it used
last_day to store the first day of the next month.
Merge pull request #26 from kylef/docs-rsync

docs: It's rsync_project not rysnc_project
Fix a typo in a comment.
Fixed SortedDict.__copy__()

Fixed #18175 -- Calling SortedDict.__copy__() resulted in changes to
the original dictionary. The reason was likely related to subclassing
dict.

Thanks to linovia for report and patch.
Merge branch 'master' of github.com:django/django
Fixed a small formatting error.
Add @leereilly to contributor list.

See commit message at for https://code.djangoproject.com/changeset/16324 verification.
Replaced print statement by print function (forward compatibility syntax).
Fixed #18217 -- Time zone support in generic views

Introduced a distinct implementation depending on the type of the
date field (DateField or DateTimeField), and applied appropriate
conversions is the latter case, when time zone support is enabled.
Fixed #4746 -- Allowed spaces around filter separator.
Moved Lee Reilly's entry to the correct location
Add @gsong to AUTHORS

See <https://code.djangoproject.com/ticket/10931> for my contribution.
Merge pull request #31 from gsong/add-to-authors

Added @gsong to AUTHORS
Merge pull request #27 from leereilly/update-authors

Added @leereilly to contributor list.
Skip model validation when models are known good.

In some situations Django calls model validation when the models are
already known good. This is most visible in tests, which use flush
and loaddata commands. This resulted in around 10% overhead when
running tests under sqlite.
Fixed #17742 -- Handled aware datetimes in DateField

Converted aware datetimes to the default time zone before using them
in the context of a DateField.
Clarified warning about date-based generic views.
emacs: added ensime and scala-mode
emacs: reset mouse-wheel-scroll-amount
cleanup: rename goal.package_upgrades to package_obsoletes.

so theres no duplicit package_downgrdes doing the same thing internally.
py: goal.downgrade_to and goal.list_downgrades
allow creating at most one cmdline repo.
Minor changes in app.dart.
Fix LMAP to use local memory banks (threads allocate their own memory portion)
Print overflow
Updated to latest translation contributed to Transifex project.
Updated translation template to match sources.
Added .mo compilation reminder to release instructions.
Updated translation templates to reflect latest source.
Add calculation api for solar system and ROI
Changes in the selenium test
first version of a simple scanner
first version of a simple scanner
adding test.alb file for the scanner
adding gitignore file
adding sublime project files to ignore
restore content files
adding lexer
adding src folder, Makefile and parser
building Makefile
modyfing .gitignore until we repair Makefile output
modyfing .gitignore until we repair Makefile output
moving test.alb to a specific folder
Add zookeeper dependencies in package.json
organized a bit
organized a bit
init
commit data
mod game interface css
added readme
enabled to load external url
mod some files
emu
emu
enabled open url in external browser
emu
input change
input change
Merge branch 'master' of https://github.com/alimg/parasight.git
input change
Merge branch 'master' of https://github.com/alimg/parasight.git
HttpProxy ignores 'host' part of the path if it does not start with www or the two test hosts - because in those cases there is a host and in all others, currently, there is no host
Add nagios tags for Contracts Finder
Rename extension to SCSS
Update to use SCSS stacking and improve readibility

Due to the way that this file was written, most of the effort here is to
improve readibility of the CSS by pulling apart attributes.
Checking option creation code.
Read table name from conf file
add unbind-key
add option to only use python module name in test path
Merge pull request #1 from ameade/add-regex-support

add option to only use python module name in test path
enjoy 0.46!
fix grammar
Makefile: introduce htdocsdir as overridable destination

create links to tango icons while installing htdocsdir/images

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
Makefile: split build rules from install rules

to allow privilege separation between building (as user) and
installing (as root)

adjust debian/rules accordingly

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
update-piuparts-setup: use Makefile for installation

Simplify running piuparts from GIT: use
  make install prefix=... htdocsdir=... docdir=...
to install everything into PIUPARTS_PREFIX, no more manual copying
from git checkout.

* make ~/piupart[ms]/bin links to PIUPARTS_PREFIX/share/piuparts/ROLE
* copy .forward from PIUPARTS_PREFIX/etc/piuparts/forward-ROLE
* run the crontabs from PIUPARTS_PREFIX/etc/piuparts/crontab-ROLE

NOTE: Configuration now resides in PIUPARTS_PREFIX/etc/piuparts
      instead of PIUPARTS_PREFIX/etc
      Update your /etc/piuparts link!

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
more things TODO

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
move some stuff to 0.47, aiming to release 0.46 sooner
mv org/piuparts.debian.org/etc/scripts* custom-scripts/

reduce path length and nesting

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
mv org/piuparts.debian.org/htdocs/templates/mail/* bug-templates/

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
mv org/piuparts.debian.org/htdocs/ htdocs/

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
Makefile: update for new locations

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
piuparts-report: drop in-code index.tpl stub.
it's clearly marked obsolete, so..
Merge remote branch 'andreas/shuffling-part-1' into develop
announce 0.45
test less at home
p-s: fix wrong name of terminate method

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
Merge remote branch 'andreas/fixes' into develop
fix method names #2
Expanded hint functionality to build up whole sets.
Updated Imports and Depends in Namespace
Added pseudocode directory. Wrote hypothetical functional language snippet and done some TAPL exercises.
Setup model class and ActiveRecord load hook
Add log model and basic active_record spec setup
Adding --fast-normalize mode.
the rendering is fine, the werid thing mentioned before is a visual illusion
Separated server and client into separate classes
cycle1 must have for-cycles
Update resume.txt

题外话
unique actcodename
Add some javadocs <3<3<3
Merge branch 'master' of https://github.com/ant2/eXceedVote

Conflicts:
	src/com/github/ant2/exceedvote/dao/BallotDao.java
	src/com/github/ant2/exceedvote/dao/CommissionerDao.java
	src/com/github/ant2/exceedvote/dao/DaoFactory.java
	src/com/github/ant2/exceedvote/dao/ProjectDao.java
	src/com/github/ant2/exceedvote/dao/UserDao.java
	src/com/github/ant2/exceedvote/dao/VoterDao.java
	src/com/github/ant2/exceedvote/model/process/LoginProcess.java
render collections in true rails way
Merge pull request #12 from nashby/render-collection

render collections in true rails way
Exclude a Batik icon from RAT

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/branches/release4.9@1425434 13f79535-47bb-0310-9956-ffa450edef68
- Added tests to check begin / end behavior in always block
- Modified existing tests check that begin is automatically un-indented
Added a couple of tests to check auto-indenter.  Mostly focused on
making sure that typed code, is formatted the same way that pasted code
is (which was my problem in bug #3566347 	Tab behavior when pasting
code, which is auto-indented
Test case for error with soft as arg name
Fixed issue with indenter where named for loops were getting lost
Un-indent begin if it is at the start of a line (^\s*begin) as this will
already have been indented
Add icon for assertions in Outline view (currently using sequence icon) 
which is the icon we are using in the filter anyway.
Changed default icon for assertion to a property icon, which is what we
are using in the Outline as a filter for
assertions/properties/sequences.
Updated test to make sure paste works teh same as when we type.
Updated changelog
Cleaned up the changelog a bit
Fixed up generate auto-indenter and added test for this
Capture name if available in FOR generate loops
Added first - crude cut of gitignore file
Only capture name if there is a label, otherwise just called "if"
More documentation on what I have been doing
Have provider provide a label for GenerateIf statements.
Added a couple more files.
Misc changes to index system. Fix to pre-processor. Parser fix for event
activation with repeat statement
Merge pull request #150 from mballance-sf/master

Misc fixes for pre-processor, index system, parser
Merge remote-tracking branch 'stevenaz/master'

Conflicts:
	ChangeLog.txt
SAKIII-5540 Formatting touched CSS.
https://jira.sakaiproject.org/browse/SAKIII-5540
Tab Bar is implemented
Deleted some useless stuff
Fixed #15089 -- Added a hook to customize get_current_site.
[ignore] refactoring
uses the faster "update" mechanism to save changes to entries
removed scaffold scss file